]> 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: 160ddb2 ead3a9d)
Merge branch 'mirceakitsune/world_cubemaps' of git://de.git.xonotic.org/xonotic/xonot...
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 25 Aug 2012 12:06:37 +0000 (15:06 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 25 Aug 2012 12:06:37 +0000 (15:06 +0300)

Trivial merge