Stephen Birarda 2e9ee4f8a7 Merge branch 'atp' of github.com:birarda/hifi into atp		2016-03-09 12:16:59 -08:00
..
external
i18n
icon
resources	Merge branch 'atp' of github.com:birarda/hifi into atp	2016-03-09 12:16:59 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-09 12:16:46 -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