Merge branch 'master' into fruitiex/g-23sounds
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 16:16:43 +0000 (18:16 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 16:16:43 +0000 (18:16 +0200)
commit3d6355c456ac3a4115b7810703f5f6774359d1cc
treef20736762e9f4860623f155bf1356ae3dbb596d8
parent62084cd4a855c1d364eb8f4174b2d1a45f750835
parentf55eb33b3be7a27562f305c01d1ad425dc71c422
Merge branch 'master' into fruitiex/g-23sounds

Conflicts:
maps/g-23.map
maps/g-23.map