]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitb1423eda7e2050b008395f08093554b30956292b
treeaaac6641c10efd37243b3a4c5c3577a3a0f83ef3
parent122e8d0e383558cb4aa730b1d441b141c3d962ae
parent18363d9f4594460fe7c53295cc528543bffa44f7
Merge commit 'origin/master' into diabolik/erebusnyxplayermodel