Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 07:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/gl
History
David Rowe 1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
..
src/gl Merge branch 'master' into 21055 2016-10-06 09:29:09 +13:00
CMakeLists.txt Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00