overte-HifiExperiments/interface
David Rowe 1cb08952ae Merge branch 'master' into 20855
Conflicts:
	interface/resources/qml/ToolWindow.qml
2016-03-30 12:01:45 +13:00
..
external Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
i18n
icon replace the interface icons 2016-03-25 11:42:48 -07:00
resources Merge branch 'master' into 20855 2016-03-30 12:01:45 +13:00
src Merge pull request #7498 from Atlante45/fix/import-entities 2016-03-29 08:09:47 -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