Triplelexx fd4d9761ce merge master and resolve conflicts ... * remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping		2016-06-24 03:34:39 +01:00
..
controller
controls
controls-uit	merge master and resolve conflicts	2016-06-24 03:34:39 +01:00
desktop	Don't trigger keyboard on revealing the overlay layer	2016-06-21 16:04:06 -07:00
dialogs	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-21 14:47:45 -07:00
hifi	merge master and resolve conflicts	2016-06-24 03:34:39 +01:00
js
menus
styles
styles-uit	Fix up file browser resize handle and outlining	2016-05-25 13:10:26 +12:00
windows	Additional toolbar work	2016-06-20 15:41:21 -07:00
AddressBarDialog.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
AssetServer.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
AvatarInputs.qml	fix a bunch of bugs in qml window placement	2016-04-25 20:19:54 -07:00
Browser.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
ForceLoad.qml
InfoView.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
LoginDialog.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
QmlWebWindow.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
QmlWindow.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
Stats.qml
Tooltip.qml
ToolWindow.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
UpdateDialog.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
WebEntity.qml