overte/interface/resources/qml/hifi
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
..
dialogs merge master and resolve conflicts 2016-06-24 03:34:39 +01:00
models Attachment dialog 2016-01-26 21:55:40 -08:00
overlays Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
toolbars Additional toolbar work 2016-06-20 15:41:21 -07:00
Desktop.qml Additional toolbar work 2016-06-20 15:41:21 -07:00