Merge remote-tracking branch 'origin/master' into samual/mutator_ctf
authorSamual Lenks <samual@xonotic.org>
Mon, 10 Sep 2012 19:45:40 +0000 (15:45 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 10 Sep 2012 19:45:40 +0000 (15:45 -0400)
commit9fd3e715c41327d67779a2049e25a0c883abb4bd
tree62ef397c3ff32b630c3a0f348b04dc65cd8c8fa7
parentc5f3d8aee411e6f5a0f7b34937f2c7140aab1c6f
parentffaaa190a7d0ce5580be162747408693070894bf
Merge remote-tracking branch 'origin/master' into samual/mutator_ctf

Conflicts:
defaultXonotic.cfg
gamemodes.cfg
qcsrc/server/mutators/gamemode_nexball.qc