]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28371ca fb4b0e3)
Merge branch 'master' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 17 May 2012 21:44:58 +0000 (23:44 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 17 May 2012 21:44:58 +0000 (23:44 +0200)
Wtf, master merge needs commit? oO


Trivial merge