Merge remote branch 'origin/michel' into jeroen

3a38ef44 · Jeroen Vreeken · d69b8d5d · 0a249ba6 · 3a38ef44 · 3a38ef44
Commit 3a38ef44 authored May 30, 2013 by Jeroen Vreeken
--- a/doc/CAMRAS_control_sw - versie 0.7 schema CONS.svg
+++ b/doc/CAMRAS_control_sw - versie 0.7 schema CONS.svg
--- a/doc/CAMRAS_control_sw - versie 0.8 schema CTRL.svg
+++ b/doc/CAMRAS_control_sw - versie 0.8 schema CTRL.svg
--- a/doc/CAMRAS_control_sw - versie 0.8.odt
+++ b/doc/CAMRAS_control_sw - versie 0.8.odt