]> 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: 122e8d0 18363d9)
Merge commit 'origin/master' into diabolik/erebusnyxplayermodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 14 Jun 2010 18:42:41 +0000 (14:42 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 14 Jun 2010 18:42:41 +0000 (14:42 -0400)

Trivial merge