3 commits

Author	SHA1	Message	Date
Thulinma	2062d83858	New licensing system ... By Wouter Spruit and Balder Viëtor with minor edits by me	2016-09-27 13:43:53 +02:00
Thulinma	1172768c34	Merge branch 'development' into LTS_development ... # Conflicts: # lib/shared_memory.cpp # src/controller/controller.cpp # src/controller/controller_storage.h # src/output/output.cpp	2016-09-15 16:17:06 +02:00
Thulinma	4bdbd82f66	LTS Commits	2015-04-05 21:38:36 +02:00