Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 30 Dec 2011 14:34:33 +0000 (15:34 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 30 Dec 2011 14:34:33 +0000 (15:34 +0100)
commit84647dd93e42da010a955727b1665770eae8dba2
treedca47125f3fd43b738ebef66919d4bd24dedce9c
parentdee94e9ec0aab132ab0293c5952d722392336a96
parent9e1249a93e9229051b71f9b01864f71a71d095b8
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir