]> 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: c9b098f bd4eebf)
Merge branch 'master' into cbrutail/map-vociferous cbrutail/map-vociferous
authorRudolf Polzer <divverent@xonotic.org>
Mon, 23 Sep 2013 14:24:29 +0000 (16:24 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 23 Sep 2013 14:24:29 +0000 (16:24 +0200)

Trivial merge