]> 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: 7e3d897 a93bf9e)
Merge branch 'master' into divVerent/opera-by-morphed
authorRudolf Polzer <divverent@xonotic.org>
Sun, 2 Oct 2011 18:48:40 +0000 (20:48 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 2 Oct 2011 18:48:40 +0000 (20:48 +0200)

Trivial merge