]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94a3356 e9b126a)
Merge branch 'master' into mirceakitsune/player_cubemaps
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 17 Sep 2012 23:00:49 +0000 (02:00 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 17 Sep 2012 23:00:49 +0000 (02:00 +0300)

Trivial merge