Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-13 04:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-JulianGro/libraries/render-utils
History
Atlante45 11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
2014-12-16 15:02:37 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 2014-12-16 15:02:37 -08:00
CMakeLists.txt try this 2014-12-16 12:15:57 -08:00