From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Sun, 11 Apr 2010 18:13:07 +0000 (+0200)
Subject: Merge commit 'origin/esteel/anim/framework'
X-Git-Tag: xonotic-v0.1.0preview~659
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d39755327593806656bcd30cd9d0cbee34cfd5c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'origin/esteel/anim/framework'
---

7d39755327593806656bcd30cd9d0cbee34cfd5c