]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Sat, 26 Nov 2011 11:39:28 +0000 (12:39 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 26 Nov 2011 11:39:28 +0000 (12:39 +0100)
commitb3cdb8ea20b79947cd65935ef70997edc00ed2f6
treed5a6d1cfffe2a30803d9a2382c09c7bad70f8456
parent3c59e14a26143d67566bc8788c86667afc0db681
parentdb7902e3541c8ea74cadb8e64c601e46977f6e52
Merge branch 'master' into divVerent/csqcmodel