]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 14:56:56 +0000 (15:56 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 14:56:56 +0000 (15:56 +0100)
commit845688edbe9045b65b6e9978be287b0e3bda3e30
treee54848b7dfa57d7ff5de7d3fe071cc313676138c
parent9073895ec20293b4067664cb9b0f8a6ada627682
parent88323e586852adfa78a5761f71ac88f5ae0bfce6
Merge branch 'master' into divVerent/csqcmodel

Conflicts:
qcsrc/common/constants.qh
defaultXonotic.cfg
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src