David Rowe 7b9e6b52fb Merge branch 'master' into 20872 ... Conflicts: interface/resources/qml/hifi/dialogs/RunningScripts.qml		2016-04-22 13:19:47 +12:00
..
external
i18n
icon	lots	2016-03-31 09:21:08 -07:00
resources	Merge branch 'master' into 20872	2016-04-22 13:19:47 +12:00
src	Merge pull request #7718 from zzmp/fix/release-motion-states	2016-04-21 17:11:25 -07:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	add pthread link dependency to interfac for UNIX	2016-04-14 16:35:51 -07:00
interface.exe.manifest	Add Windows manifest to interface.exe	2016-03-31 14:20:19 -07:00