]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitd8462cdfd7d8ed7880c1f0536b1b4c354ed81d70
treeadd8c8655625708b7f87ba5b62ec09f9d555f828
parent94a3356ec086f75cb5692097ff1246a951402e5b
parente9b126aee2558f43cca29571fe9e8ac75a470bfa
Merge branch 'master' into mirceakitsune/player_cubemaps