overte-Armored-Dragon/interface
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
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon fix check for debug/release icon 2015-01-30 15:41:44 -08:00
resources Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 2015-07-20 15:18:23 -07:00
src Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 2015-07-20 15:18:23 -07:00
ui Merge fixes 2015-07-13 19:07:44 -07:00
CMakeLists.txt Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 2015-07-20 15:18:23 -07:00
interface_en.ts remove more references to voxels 2015-01-07 16:09:56 -08:00
InterfaceVersion.h.in