From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 9 Oct 2011 14:18:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/fruitiex/animations'
X-Git-Tag: xonotic-v0.6.0~40^2~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=60ed95fe707decf91bb54393d4c11ee4faa2e418;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/fruitiex/animations'
---

60ed95fe707decf91bb54393d4c11ee4faa2e418