Merge branch 'kuniuthefrogg/abyss' of ssh://push.git.xonotic.org/xonotic-maps.pk3dir...
authorkuniuthefrogg <ekuniu@gmail.com>
Fri, 1 Mar 2013 22:19:14 +0000 (23:19 +0100)
committerkuniuthefrogg <ekuniu@gmail.com>
Fri, 1 Mar 2013 22:19:14 +0000 (23:19 +0100)
commit51ad92b8f09169379afa9ab62295befe5350621e
tree7d85d20040b18271f3d183a4ad1035b7825b60f4
parent1cfe63b5d62a249c620fd77ac054c3a13681b317
parentda40d8239cfdc5261644cab79e6b73d8426d2246
Merge branch 'kuniuthefrogg/abyss' of ssh://push.git.xonotic.org/xonotic-maps.pk3dir into kuniuthefrogg/abyss