Merge branch 'master' of ssh://git.xonotic.org/netradiant-xonoticpack
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 1 Jul 2011 09:30:39 +0000 (11:30 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 1 Jul 2011 09:30:39 +0000 (11:30 +0200)
commit1172bedf8578207d2cbc15942cf804231126ec9b
treedae99f92cefdd2f5d67754ea7822834ba7bf0ece
parent2f7d0dd0b6ede2964db7ff424eeb9e48962860d4
parent24b4cf6dafb2d06d530273ce751d966aa22cffa9
Merge branch 'master' of ssh://git.xonotic.org/netradiant-xonoticpack

Conflicts:
games/xonotic.game