]> 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: def8f93 e4ae40e)
Merge branch 'master' into divVerent/euclidean_fail
authorRudolf Polzer <divverent@alientrap.org>
Thu, 6 Sep 2012 17:43:53 +0000 (19:43 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 6 Sep 2012 17:43:53 +0000 (19:43 +0200)

Trivial merge