Merge remote branch 'origin/master' into fruitiex/ctsfix
authorFruitieX <fruitiex@gmail.com>
Sat, 11 Dec 2010 19:53:03 +0000 (21:53 +0200)
committerFruitieX <fruitiex@gmail.com>
Sat, 11 Dec 2010 19:53:03 +0000 (21:53 +0200)
commitd0168920d1b49c61e7867c7acac8a76fd32dc8e2
tree609f29494ce144b8ba0592f448a7235639d409e4
parent7e23eb8ddef45387339b977bdadc22eb03d09c20
parenta471ddf95bae15401e99299be86d8c2db5ad5d8c
Merge remote branch 'origin/master' into fruitiex/ctsfix
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc