]> 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: 11d8cc7 7952e74)
Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 15 Jun 2011 17:21:54 +0000 (19:21 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 15 Jun 2011 17:21:54 +0000 (19:21 +0200)

Trivial merge