]> 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:12:09 +0000 (06:12 -0800)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 29 Nov 2011 14:12:09 +0000 (06:12 -0800)
commit47dcb7c178cdc45827b28292773dea344613fa06
treeb69badb27908914e92750a320405f20e761c67b2
parentb3cdb8ea20b79947cd65935ef70997edc00ed2f6
parenta971aa3328f9d21051d7c5e42cfa846d94b8f0c2
Merge branch 'master' into divVerent/csqcmodel

Conflicts:
qcsrc/server/cl_client.qc
defaultXonotic.cfg
qcsrc/client/progs.src
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/progs.src