]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcac695 c45bfd7)
Merge remote branch 'origin/master' into diabolik/newanims
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 May 2011 19:43:28 +0000 (15:43 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 May 2011 19:43:28 +0000 (15:43 -0400)

Trivial merge