]> 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: d7ca572 fb4b0e3)
Merge branch 'master' into morphed/girder
authorcbrutail <ruszkai.akos@gmail.com>
Sat, 19 May 2012 11:00:42 +0000 (13:00 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Sat, 19 May 2012 11:00:42 +0000 (13:00 +0200)
git merge master


Trivial merge