overte/interface
Brad Davis ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-06-07 21:51:47 -07:00
..
external
i18n
icon lots 2016-03-31 09:21:08 -07:00
resources Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-07 21:51:47 -07:00
src Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-07 21:51:47 -07:00
ui Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
CMakeLists.txt Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
interface.exe.manifest Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00