Merge branch 'master' into mirceakitsune/world_cubemaps
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 5 Apr 2012 15:53:00 +0000 (18:53 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 5 Apr 2012 15:53:00 +0000 (18:53 +0300)
commit31a33d973a5355491251e7bab063a22a3cc1fa4d
tree0252ee40ee45b4d00287fadedbb63663a3b193fe
parente1e7483cdd5abf1dcab373637c27465edd179741
parente6e45ec02f6619e85d36ea942fea5ab86f173d78
Merge branch 'master' into mirceakitsune/world_cubemaps
scripts/shaderlist.txt