Alexander Bock fc048cd455 Merge branch 'master' into touch-user-study ...

# Conflicts:
#	modules/touch/include/touchmarker.h
#	modules/touch/src/touchinteraction.cpp
#	modules/touch/src/touchmarker.cpp

2017-11-09 10:30:45 -05:00

..

ext

Add time limit to levmarq solver

2017-11-02 20:50:56 +01:00

include

Merge branch 'master' into touch-user-study

2017-11-09 10:30:45 -05:00

shaders

Remove const qualifier from shaders as it causes shaders to not compile on Mac

2017-08-03 12:05:58 -04:00

src

Merge branch 'master' into touch-user-study

2017-11-09 10:30:45 -05:00

CMakeLists.txt

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

touchmodule.cpp

Cleanup for coding style

2017-11-08 10:35:39 -06:00

touchmodule.h

Jenkins compile fix

2017-07-19 21:19:39 -04:00