overte/cmake/externals/LibOVR
Brad Davis 2a1776303d Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
..
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00