]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into diabolik/umbraplayermodel
authorRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 06:46:15 +0000 (08:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 06:46:15 +0000 (08:46 +0200)
commit0a51a35ab4cfaff9b2e349331b68f074f6152f8b
tree8ae27008b5ff41331c5c5f641309ee540b89312d
parenteae0f8d6df2195d6fa4cd4a4ed1671b946f3d75b
parent536ec6a3d46e301e787277369bb78eebc986640c
Merge branch 'master' into diabolik/umbraplayermodel