Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 16:19:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/model
History
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/model Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00
CMakeLists.txt Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00