Merge branch 'diabolik/afterslime' of ssh://git.xonotic.org/xonotic-maps.pk3dir into...
authorssinghal <dib.diabolik@gmail.com>
Sun, 6 Mar 2011 21:00:58 +0000 (16:00 -0500)
committerssinghal <dib.diabolik@gmail.com>
Sun, 6 Mar 2011 21:00:58 +0000 (16:00 -0500)
commitb618d0ed6d30475c6a330da952f2c0df19cbe1d1
tree2b4b385ce44aeaa2839efd5a0b387391188bb30e
parent6f05fa7e5e4760c23333ffd008b0b5be01125e60
parentc5a920af43cfefb3bf459078dce4da8285724de0
Merge branch 'diabolik/afterslime' of ssh://git.xonotic.org/xonotic-maps.pk3dir into diabolik/afterslime

Conflicts:
maps/afterslime.mapinfo
maps/afterslime.waypoints
maps/afterslime.mapinfo