]> 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:35:44 +0000 (12:35 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 26 Nov 2011 11:35:44 +0000 (12:35 +0100)
commit6b925457ba78521c1d9caf37a855be35d476dae6
tree04fd025a91e910fccd71866a5dd2ea4cbe8d673b
parentf89561530c2390a00557515a96082197e16e76cc
parentd89a89bdc84b1997402cfbd17aaa9d043af1778f
Merge branch 'master' into divVerent/csqcmodel

Conflicts:
qcsrc/client/miscfunctions.qc
12 files changed:
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/progs.src
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src