]> 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: b7b33d8 a733dd2)
Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 28 Oct 2011 06:04:46 +0000 (08:04 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 28 Oct 2011 06:04:46 +0000 (08:04 +0200)

Trivial merge