]> 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: 6a0cb7f 6d2af60)
Merge commit 'origin/master' into diabolik/ignisplayermodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 13 May 2010 19:45:45 +0000 (15:45 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 13 May 2010 19:45:45 +0000 (15:45 -0400)

Trivial merge