]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/terencehill/ons_cp_animation_stuff'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 2 Aug 2011 05:31:14 +0000 (07:31 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 2 Aug 2011 05:31:14 +0000 (07:31 +0200)

Trivial merge