overte-Armored-Dragon/interface/resources/qml
NeetBhagat ead0d42cf3 Merge branch 'master' into 21369
# Conflicts:
#	libraries/gl/src/gl/OffscreenQmlSurface.cpp
#	libraries/gl/src/gl/OffscreenQmlSurface.h
2017-06-07 15:47:19 +05:30
..
controller
controls Migrate to single QML engine 2017-06-05 15:14:44 -07:00
controls-uit Migrate to single QML engine 2017-06-05 15:14:44 -07:00
desktop Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
dialogs Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
hifi Migrate to single QML engine 2017-06-05 15:14:44 -07:00
js
LoginDialog resize the sign up dialog when showing errors 2016-12-12 13:04:14 -08:00
styles
styles-uit pal selection changes 2017-04-06 12:07:51 -07:00
TabletLoginDialog Revert "Merge from upstream/master" 2017-03-28 17:39:45 -07:00
windows Revert "Merge from upstream/master" 2017-03-28 17:39:45 -07:00
AddressBarDialog.qml fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
AssetServer.qml Merge remote-tracking branch 'upstream/master' into 21224 2017-03-30 01:25:27 +01:00
AvatarInputs.qml Revert "Actually merge from master" 2017-03-24 17:56:48 -07:00
Browser.qml Migrate to single QML engine 2017-06-05 15:14:44 -07:00
ConnectionFailureDialog.qml Add ConnectionFaiureDialog qml 2016-10-24 10:52:46 -07:00
ForceLoad.qml
InfoView.qml Support toolbar API 2016-06-17 13:06:42 -07:00
LoginDialog.qml fix resizing of LoginDialog and friends 2016-12-12 11:32:19 -08:00
QmlWebWindow.qml Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00
QmlWindow.qml intial commit #21369 Working on clear method of console 2017-06-07 14:37:18 +05:30
Stats.qml Solving the size evaluation for compressed format 2017-05-22 16:51:54 -07:00
StatText.qml Add more GPU stats, make stats easier to read 2016-10-22 14:38:46 -07:00
TabletBrowser.qml Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Tooltip.qml
ToolWindow.qml Only raise keyboard if in HMD display mode 2016-10-12 09:43:33 +13:00
UpdateDialog.qml changed old icon to new icon 2016-11-02 08:23:10 -07:00
Web3DOverlay.qml Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00