]> 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: 1282061 b8b2872)
Merge branch 'master' into divVerent/stormkeep-sRGB
authorRudolf Polzer <divverent@xonotic.org>
Thu, 29 Dec 2011 11:42:57 +0000 (12:42 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 29 Dec 2011 11:42:57 +0000 (12:42 +0100)

Trivial merge