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
..
qml	Move controller test to app	2015-10-17 19:13:38 -07:00
src	merge master and resolve conflicts	2016-06-24 03:34:39 +01:00
CMakeLists.txt	rework plugins to not depend on PluginContainer unless they want to	2016-06-21 12:07:05 -07:00