Seth Alves 37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions		2016-09-06 09:38:44 -07:00
..
external	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
i18n
icon	lots	2016-03-31 09:21:08 -07:00
resources	Merge pull request #8554 from elisa-lj11/marketplaces_html	2016-09-02 17:12:05 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-06 09:38:44 -07:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	repairs for non-android builds after changes	2016-08-31 17:28:09 -07:00
interface.exe.manifest	Add Windows manifest to interface.exe	2016-03-31 14:20:19 -07:00