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
..
external	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
i18n
icon	lots	2016-03-31 09:21:08 -07:00
resources	merge master and resolve conflicts	2016-06-24 03:34:39 +01:00
src	merge master and resolve conflicts	2016-06-24 03:34:39 +01:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	rework plugins to not depend on PluginContainer unless they want to	2016-06-21 12:07:05 -07:00
interface.exe.manifest	Add Windows manifest to interface.exe	2016-03-31 14:20:19 -07:00