]> 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: 7de789f 24c6fe5)
Merge branch 'master' into divVerent/opera-by-morphed
authorRudolf Polzer <divverent@alientrap.org>
Thu, 2 Feb 2012 17:03:00 +0000 (18:03 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 2 Feb 2012 17:03:00 +0000 (18:03 +0100)

Trivial merge