John Conklin II 67b1313fb6 Merge pull request #12669 from ElderOrb/FB13143 ... Fix several styling/alignment/overlapping issues in 'Add to world' and 'Rename' dialogs in Asset Browser		2018-04-12 10:34:58 -07:00
..
+android	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
controller
controls	Introduce safeLoading.	2018-04-03 13:49:09 -07:00
controls-uit	fix conditional bindings	2018-04-06 13:22:27 +03:00
desktop
dialogs	Merge pull request #12669 from ElderOrb/FB13143	2018-04-12 10:34:58 -07:00
hifi	Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage	2018-04-12 10:34:17 -07:00
js
LoginDialog	Android - Joystick hidden when opening login and shown after Cancel.	2018-03-09 17:41:05 -03:00
styles
styles-uit	Remove reference to non existing id	2018-03-10 16:35:17 +01:00
windows	fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear)	2018-04-06 03:00:44 +03:00
AudioScopeUI.qml	minimize diff	2018-03-29 11:24:31 -07:00
AvatarInputsBar.qml	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 02:20:34 +03:00
Browser.qml
ConnectionFailureDialog.qml
CurrentAPI.qml	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
ForceLoad.qml
InfoView.qml
LoginDialog.qml
OverlayWindowTest.qml
QmlWebWindow.qml
QmlWindow.qml
Stats.qml	Add more timing stats in explanded mode	2018-02-28 10:48:35 -08:00
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml