]> 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 | compact (merge: 403aafc 316b2df)
Merge commit 'origin/master' into diabolik/ignisplayermodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sun, 16 May 2010 18:57:29 +0000 (14:57 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sun, 16 May 2010 18:57:29 +0000 (14:57 -0400)

Trivial merge