Brad Davis 91768b3992 Merge pull request #5450 from SamGondelman/sam/input-plugins ... Plugins branch - re-remove hand lasers		2015-07-28 16:25:55 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers	2015-07-20 15:18:23 -07:00
src	Merge pull request #5450 from SamGondelman/sam/input-plugins	2015-07-28 16:25:55 -07:00
ui	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-20 19:21:02 -07:00
interface_en.ts
InterfaceVersion.h.in