Merge branch 'master' into fruitiex/runningmanctf
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 11:29:57 +0000 (13:29 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 11:29:57 +0000 (13:29 +0200)
Conflicts:
sound/wind/WindDesert-Loop.wav
sounds/wind/WindDesert-Loop.WAV
sounds/wind/WindDesert-Loop.wav


Trivial merge