Dante Ruiz ae111ff2e9 Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto		2017-03-23 18:25:31 +01:00
..
external
i18n
icon
resources	Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto	2017-03-23 18:25:31 +01:00
src	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
ui	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
interface.exe.manifest