Merge branch 'master' into mirceakitsune/world_cubemaps
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 4 Apr 2012 21:36:03 +0000 (00:36 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 4 Apr 2012 21:36:03 +0000 (00:36 +0300)
1  2 
scripts/exx.shader

Simple merge