Merge remote branch 'origin/master' into samual/hagar_secondary_autorelease
authorSamual <samual@xonotic.org>
Mon, 26 Sep 2011 16:51:08 +0000 (12:51 -0400)
committerSamual <samual@xonotic.org>
Mon, 26 Sep 2011 16:51:08 +0000 (12:51 -0400)
commit4337dab09bbbe024bcc77db446ed76962fb17f0d
treeed4ac249674016924c669bc6e28772947bd18596
parent1723f6fdc329a322ba588482fcba25cc44008fe0
parenta084941bf63f7b642b99eb5845e3020792a58501
Merge remote branch 'origin/master' into samual/hagar_secondary_autorelease

Conflicts:
qcsrc/server/w_hagar.qc
balanceXonotic.cfg
qcsrc/server/w_hagar.qc