overte-HifiExperiments/libraries/gpu
Niraj Venkat eaf75c01b9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.h
2015-07-20 14:55:27 -07:00
..
src/gpu Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-20 14:55:27 -07:00
CMakeLists.txt Making nsight usage optional (still defaults to on) 2015-03-16 12:59:41 -07:00