Zach Fox 3b8e52ea41 Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)		2018-04-17 15:11:50 -07:00
..
+android	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
controller	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
controls	Merge pull request #12068 from vladest/move_to_qqc2	2018-04-12 11:26:55 -07:00
controls-uit	Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018	2018-04-16 10:12:34 -07:00
desktop	Merge pull request #12888 from SamGondelman/statsAssert	2018-04-13 16:35:28 -07:00
dialogs	rollback some qml changes on android	2018-04-13 14:28:00 -07:00
hifi	Bugfixes per QA	2018-04-16 11:53:37 -07:00
js	remove cached file	2018-02-13 11:07:15 -08:00
LoginDialog	Merge branch 'master' into move_to_qqc2	2018-03-24 15:32:04 +01:00
styles
styles-uit	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
windows	Merge pull request #12723 from ctrlaltdavid/21801	2018-04-16 11:12:26 -07:00
AudioScopeUI.qml	minimize diff	2018-03-29 11:24:31 -07:00
AvatarInputsBar.qml	Merge branch 'master' into move_to_qqc2	2018-03-24 15:32:04 +01:00
Browser.qml	Merge branch 'master' into move_to_qqc2	2017-11-26 10:18:44 +01:00
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	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
QmlWindow.qml	Move Slider	2017-12-28 15:39:22 +01:00
Stats.qml	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01:00
StatText.qml	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
TabletBrowser.qml	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00