Brad Hefta-Gaub 35d6afbe77 Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable		2016-03-08 14:53:41 -08:00
..
external
i18n
icon
resources	Merge pull request #7247 from jherico/qml_script_messaging	2016-03-08 10:21:09 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable	2016-03-08 14:53:41 -08:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	manually install OpenSSL DLLs for Qt	2016-03-03 17:57:34 -08:00