overte-HifiExperiments/interface
David Rowe 8d778141ef Merge branch 'master' into 20855
Conflicts:
	interface/resources/qml/ToolWindow.qml
2016-03-24 10:39:09 +13: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 branch 'master' into 20855 2016-03-24 10:39:09 +13:00
src Expose qApp->updateHeartbeat 2016-03-22 17:17:36 -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