Seth Alves 1da6349505 merge from upstream		2017-03-21 10:26:02 -07:00
..
external
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
src	merge from upstream	2017-03-21 10:26:02 -07:00
ui	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04:00
CMakeLists.txt	Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination	2017-03-07 10:11:09 +01:00
interface.exe.manifest