]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/player_cubemaps
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 10 Sep 2012 13:36:58 +0000 (16:36 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 10 Sep 2012 13:36:58 +0000 (16:36 +0300)
commitbe2428a92a8c3f81efabad5e066cbf68fc9d611c
tree07c39d0b03ee79a862a8f84d25c91a8f0d1dc4e5
parent00c96fe408d8b08e6cc85c7c4070961bf26b2f53
parent9e17e0bc2f1af717f39d364ba26ef3a308842e17
Merge branch 'master' into mirceakitsune/player_cubemaps