Stephen Birarda bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings		2016-03-08 11:37:27 -08:00
..
external	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
i18n	Updated english translation file	2015-10-15 11:15:06 -07:00
icon
resources	Merge pull request #7247 from jherico/qml_script_messaging	2016-03-08 10:21:09 -08:00
src	Merge branch 'atp' of github.com:birarda/hifi into atp-mappings	2016-03-08 11:37:27 -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