Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 05:48:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/render-utils
History
Brad Davis 155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
..
res/fonts
src Merge remote-tracking branch 'upstream/master' into plugins 2015-07-31 10:28:06 -07:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into plugins 2015-07-20 19:21:02 -07:00