Bradley Austin Davis 53ccbfc4fa Merge branch 'core' into plugins		2015-08-03 22:25:50 -07:00
..
external	trying to fix connexion linker errors, general style fixes, renamed some files	2015-08-01 11:41:29 -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 branch 'core' into plugins	2015-08-03 22:25:50 -07:00
ui	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
CMakeLists.txt	Merge branch 'core' into plugins	2015-08-03 22:25:50 -07:00
interface_en.ts
InterfaceVersion.h.in