]> 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: 35480a3 38b5218)
Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 18 May 2011 15:56:23 +0000 (17:56 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 18 May 2011 15:56:23 +0000 (17:56 +0200)

Trivial merge