]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@alientrap.org>
Tue, 29 Nov 2011 14:36:26 +0000 (06:36 -0800)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 29 Nov 2011 14:36:26 +0000 (06:36 -0800)
commit3075f859f31fc7f9a7b2bcac4f2c42b96796a28a
tree0c9da7dbffcc1f1f9fd698eb09ede530226caffa
parent1734c58cde70529ca7364526fd976d727b189d67
parent0396c956370d03a0de773812fd48963fe028018e
Merge branch 'master' into divVerent/csqcmodel
defaultXonotic.cfg
qcsrc/client/autocvars.qh