3 Commits

Include renames

Author	SHA1	Message	Date
jancoow	3f8623d0bf	Merge remote-tracking branch 'origin/developer' into feature/Controller ... Added support for second controller # Conflicts: # CrystalPoint.cpp # CrystalPoint.h # CrystalPoint.vcxproj # CrystalPoint.vcxproj.filters	2016-06-21 11:24:55 +02:00
jancoow	030a136e8b	Working version for linux	2016-06-20 20:00:58 +02:00
jancoow	7d13269480	Refactor johan branch for compiling with g++	2016-05-22 23:19:05 +02:00