overte/libraries/display-plugins
Anthony J. Thibault 80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
..
src/display-plugins Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 2015-07-20 15:18:23 -07:00
CMakeLists.txt Trying to fixup the plugins compilation 2015-07-02 00:00:00 -07:00