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

..

touchinteraction.h

Merge branch 'master' into touch-user-study

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

touchmarker.h

Merge branch 'master' into touch-user-study

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

tuioear.h

Merge branch 'master' into touch-user-study

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