]> de.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: a9f168e fb4b0e3)
Merge branch 'master' into mirceakitsune/world_cubemaps
authorRudolf Polzer <divverent@xonotic.org>
Thu, 5 Apr 2012 16:09:50 +0000 (18:09 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 5 Apr 2012 16:09:50 +0000 (18:09 +0200)

Trivial merge