]> icculus.org git repositories - divverent/nexuiz.git/commit
Merge remote branch 'origin/master' into div0/warpzones
authorRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sat, 13 Feb 2010 15:45:38 +0000 (16:45 +0100)
committerRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sat, 13 Feb 2010 15:45:38 +0000 (16:45 +0100)
commitcc6a14cfdd48b7cf61b1cf5b304eeaf78c01ce78
treecc30d94365da24e7b328c05544cd4a5077e45934
parentc1c7a26dd718e9a913f4c0c356c7a0f75e16e162
parent51d5642e3b734c72a63f21ced357c10224d988dc
Merge remote branch 'origin/master' into div0/warpzones
data/qcsrc/client/Main.qc
data/qcsrc/common/util.qh
data/qcsrc/server/miscfunctions.qc