Merge branch 'cbrutail/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps...
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 6 Jan 2012 15:59:24 +0000 (16:59 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 6 Jan 2012 15:59:24 +0000 (16:59 +0100)
commitd9962ae100f5331ce8e6cec0a193d928fe1b80c4
treee5699d2d034cbc9922501a55497fe2986e38a346
parent1ce1a1bad74c7bb96d451e9a64a5fc1d6e4faeea
parent2ef922a9865b448203a1f4591d1673f0cf69d021
Merge branch 'cbrutail/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrutail/darkzone