Merge remote-tracking branch 'origin/divVerent/noautomaplist'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 23 Sep 2013 15:23:25 +0000 (17:23 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 23 Sep 2013 15:23:25 +0000 (17:23 +0200)
commit1ea3b0365fd6fbb31c38cf6d22ee0b952e9010c1
tree3c0cb102e1f0aec68c678abd674179571fac0ab8
parent8e6a61d0dd23c6cbd3dc98fb08b4d0f0c6c9477a
parent0af14c79dd34c3b0901e33a67428189698e8de25
Merge remote-tracking branch 'origin/divVerent/noautomaplist'

Conflicts:
qcsrc/common/mapinfo.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/server/g_world.qc