]> 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: 9a951f4 bd4eebf)
Merge branch 'master' into cbrutail/map-confusor
authorcbrutail <ruszkai.akos@gmail.com>
Tue, 10 Sep 2013 20:52:37 +0000 (22:52 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Tue, 10 Sep 2013 20:52:37 +0000 (22:52 +0200)
mergy mergy, maybe worky worky


Trivial merge