]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge commit 'origin/master' into diabolik/umbraplayermodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 15 May 2010 18:05:35 +0000 (14:05 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 15 May 2010 18:05:35 +0000 (14:05 -0400)
commit709df297e89bc0440f60c1ec97cc1d67b9ef12d1
treedfd8e0428a8c0a1b6c97bc7534cfad4152e50eaf
parent76c2456b3d8928a00a080440dde26723f5cd737d
parent18d6521b3f7e760b9d2329bd0fd51067b91d8f1f
Merge commit 'origin/master' into diabolik/umbraplayermodel