overte/libraries/entities-renderer
Brad Hefta-Gaub a12446dab5 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-02-21 10:10:24 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 10:10:24 -08:00
CMakeLists.txt Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00