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
..
dialogs	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-07 21:51:47 -07:00
models	Attachment dialog	2016-01-26 21:55:40 -08:00
overlays	Snapshot dialogs	2016-02-01 11:07:48 -08:00
Desktop.qml	Disable arrow keys being able to move between HTML form fields	2016-04-08 10:30:00 +12:00