Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@alientrap.org>
Tue, 6 Dec 2011 10:21:57 +0000 (11:21 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 6 Dec 2011 10:21:57 +0000 (11:21 +0100)
commit23746186add00c053fb47180fba17e25393da956
tree2018a6d7b21904ebbc286f313efc647805199830
parentd53800a81ad1253e6ee6eca8b9971bbf275df7ee
parent4741095d1814761513e883378d1e62c6dced4bb4
Merge branch 'master' into divVerent/csqcmodel
defaultXonotic.cfg
qcsrc/server/cheats.qc