Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 02:25:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/shared
History
Brad Davis a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
2015-06-17 19:53:31 -07:00
..
src Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 19:53:31 -07:00
CMakeLists.txt Removing build of oglplus and boostconfig on non-Windows 2015-06-09 10:29:10 -07:00