2 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
kennyboy55	da0b1f5588	Johan fix	2016-06-20 17:16:29 +02:00