]> de.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: 0e37134 906ae86)
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 29 Dec 2011 16:02:49 +0000 (17:02 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 29 Dec 2011 16:02:49 +0000 (17:02 +0100)

Trivial merge