]> 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: eb3fe33 e4ae40e)
Merge branch 'master' into divVerent/opera-by-morphed
authorRudolf Polzer <divverent@xonotic.org>
Tue, 18 Sep 2012 12:43:12 +0000 (14:43 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 18 Sep 2012 12:43:12 +0000 (14:43 +0200)

Trivial merge