]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46ce95f cdbf4d4)
Merge remote-tracking branch 'origin/diabolik/newanims'
authormerlijn <mhofstra@gmail.com>
Mon, 23 May 2011 19:29:18 +0000 (21:29 +0200)
committermerlijn <mhofstra@gmail.com>
Mon, 23 May 2011 19:29:18 +0000 (21:29 +0200)

Trivial merge