Brad Davis aea07fe671 Merge branch 'master' into gl4_1 ... Conflicts: libraries/gpu/src/gpu/Config.slh libraries/render-utils/src/deferred_light_limited.slv libraries/render-utils/src/simple.slf libraries/render-utils/src/simple_textured.slf tests/render-utils/src/main.cpp tools/scribe/src/main.cpp		2015-07-31 15:08:37 -07:00
..
src	Merge branch 'master' into gl4_1	2015-07-31 15:08:37 -07:00
CMakeLists.txt	don't call copy dll step for scribe	2015-02-25 11:02:05 -08:00