]> 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 | compact (merge: 7368551 f7bcb1a)
Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 6 Jun 2011 19:00:00 +0000 (21:00 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 6 Jun 2011 19:00:00 +0000 (21:00 +0200)

Trivial merge