From: Rudolf Polzer Date: Tue, 2 Aug 2011 05:31:14 +0000 (+0200) Subject: Merge remote branch 'origin/terencehill/ons_cp_animation_stuff' X-Git-Tag: xonotic-v0.5.0~122^2^2~13 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=da76babfac1d42381b7136ad948068f93e5c569f;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/terencehill/ons_cp_animation_stuff' --- da76babfac1d42381b7136ad948068f93e5c569f