]> icculus.org git repositories - divverent/nexuiz.git/commit
Merge branch 'master' into div0/warpzones
authorRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sat, 27 Feb 2010 18:26:43 +0000 (19:26 +0100)
committerRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sat, 27 Feb 2010 18:26:43 +0000 (19:26 +0100)
commit7fdbab45ad2c389b8863ead1b2f0d9d8d409ebc6
tree777a33ada36743b9bb3a97cb9faf84ace385ba30
parentc881ca3b6f16e7ff3c73e2f0b1c594d703a21841
parentf8e295131e9395c5832f480ddce7bdd6ce593a82
Merge branch 'master' into div0/warpzones

Conflicts:
data/qcsrc/server/w_crylink.qc
data/qcsrc/server/cheats.qc
data/qcsrc/server/cl_weaponsystem.qc
data/qcsrc/server/miscfunctions.qc
data/qcsrc/server/w_electro.qc