Merge branch 'master' into mirceakitsune/world_cubemaps
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 25 Aug 2012 12:04:23 +0000 (15:04 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 25 Aug 2012 12:04:23 +0000 (15:04 +0300)
commit160ddb2c2a2ffe956770cb7d4128e9424d3b7cc2
tree62fbf304aa13cbe0311ed4b9224af330f85566cb
parenta9f168ef698b42f8a93d6d9e5240933727d62e67
parentfb4b0e3abb8191950b0d64a00e91a7cc0d8ce7fd
Merge branch 'master' into mirceakitsune/world_cubemaps