overte-HifiExperiments/interface/resources/qml/hifi/dialogs
Brad Davis 472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui
Conflicts:
	scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
..
attachments Pinned UI support 2016-06-02 17:24:25 -07:00
AttachmentsDialog.qml Pinned UI support 2016-06-02 17:24:25 -07:00
AudioPreferencesDialog.qml Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +13:00
AvatarAttachmentsDialog.qml Force Qt (rather than OS) rendering in a number of places 2016-02-03 14:51:05 -08:00
AvatarPreferencesDialog.qml Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +13:00
GeneralPreferencesDialog.qml Change name of dialog to match menu item 2016-02-25 20:37:54 +13:00
GraphicsPreferencesDialog.qml Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +13:00
LodPreferencesDialog.qml Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +13:00
ModelBrowserDialog.qml Pinned UI support 2016-06-02 17:24:25 -07:00
RunningScripts.qml Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-10 10:43:09 -07:00
SnapshotShareDialog.qml Snapshot dialogs 2016-02-01 11:07:48 -08:00