Merge branch 'master' into mirceakitsune/sandbox
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 5 Nov 2011 22:26:41 +0000 (00:26 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 5 Nov 2011 22:26:41 +0000 (00:26 +0200)
commitd3dd60b4ab7b66105190d5572ebd248c95fc04b0
tree8d8e9b81d930b26f3cf9cb32338d98b2c64a19c1
parent9508e981d681cddac8a1e09fd8ad715a05c22bb7
parentbbb9a7915c10dea610474fe7e0d5c08f9edf62fd
Merge branch 'master' into mirceakitsune/sandbox
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc