]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce31c88 bd4eebf)
Merge branch 'master' into cbrutail/map-breath cbrutail/map-breath
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 25 Sep 2013 17:51:37 +0000 (19:51 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 25 Sep 2013 17:51:37 +0000 (19:51 +0200)
Merging master into my work branch of Debugger's Breath map.


Trivial merge