]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a298eae 7954866)
Merge remote-tracking branch 'origin/savagex/courtfun-sRGB'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 16 Jan 2012 19:48:38 +0000 (20:48 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 16 Jan 2012 19:48:38 +0000 (20:48 +0100)

Trivial merge