Merge branch 'master' into mirceakitsune/world_cubemaps
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 05:44:23 +0000 (16:44 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 05:44:23 +0000 (16:44 +1100)
1  2 
scripts/shaderlist.txt

Simple merge