Zach Pomerantz 5d306a74d5 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching		2016-03-25 10:09:37 -07: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 #7454 from jherico/qml_crashes	2016-03-24 17:32:38 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching	2016-03-25 10:09:37 -07: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