Seth Alves 25f6e1d79d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions		2016-09-01 15:06:52 -07:00
..
external
i18n
icon	lots	2016-03-31 09:21:08 -07:00
resources	new smaller WebView.qml	2016-08-30 14:37:08 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-01 15:06:52 -07:00
ui
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