Merge branch 'development' into guiactor

7686ae74 · Udo Eisenbarth · 5930b1cd · 1686f376 · 7686ae74 · 7686ae74
Commit 7686ae74 authored 8 years ago by Udo Eisenbarth
--- a/ImageSourceBase/Simulation/SHS/Get Configure.vi
+++ b/ImageSourceBase/Simulation/SHS/Get Configure.vi
--- a/ImageSourceBase/Simulation/SHS/ImageSourceSimulationSHS.lvclass
+++ b/ImageSourceBase/Simulation/SHS/ImageSourceSimulationSHS.lvclass
--- a/ImageSourceConfigure/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Hama/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/Hama/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Hama/ImageSourceConfigureHama.lvclass
+++ b/ImageSourceConfigure/Hama/ImageSourceConfigureHama.lvclass
--- a/ImageSourceConfigure/ImageSourceConfigure.lvclass
+++ b/ImageSourceConfigure/ImageSourceConfigure.lvclass
--- a/ImageSourceConfigure/Imaqdx/Basler/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/Imaqdx/Basler/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Imaqdx/Basler/FW/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/Imaqdx/Basler/FW/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Imaqdx/Basler/FW/ImageSourceConfigureImaqdxBaslerFW.lvclass
+++ b/ImageSourceConfigure/Imaqdx/Basler/FW/ImageSourceConfigureImaqdxBaslerFW.lvclass
--- a/ImageSourceConfigure/Imaqdx/Basler/GIGE/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/Imaqdx/Basler/GIGE/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Imaqdx/Basler/GIGE/ImageSourceConfigureImaqdxBaslerGIGE.lvclass
+++ b/ImageSourceConfigure/Imaqdx/Basler/GIGE/ImageSourceConfigureImaqdxBaslerGIGE.lvclass
--- a/ImageSourceConfigure/Imaqdx/Basler/ImageSourceConfigureImaqdxBasler.lvclass
+++ b/ImageSourceConfigure/Imaqdx/Basler/ImageSourceConfigureImaqdxBasler.lvclass
--- a/ImageSourceConfigure/Imaqdx/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/Imaqdx/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Imaqdx/ImageSourceConfigureImaqdx.lvclass
+++ b/ImageSourceConfigure/Imaqdx/ImageSourceConfigureImaqdx.lvclass
--- a/ImageSourceConfigure/Imaqdx/Phytec/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/Imaqdx/Phytec/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Imaqdx/Phytec/ImageSourceConfigureImaqdxPhytec.lvclass
+++ b/ImageSourceConfigure/Imaqdx/Phytec/ImageSourceConfigureImaqdxPhytec.lvclass
--- a/ImageSourceConfigure/Simulation/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/Simulation/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Simulation/ImageSourceConfigureSimulation.lvclass
+++ b/ImageSourceConfigure/Simulation/ImageSourceConfigureSimulation.lvclass
--- a/ImageSourceConfigure/Simulation/Offline/ConfigToConfiguredObject.vi
+++ b/ImageSourceConfigure/Simulation/Offline/ConfigToConfiguredObject.vi
--- a/ImageSourceConfigure/Simulation/Offline/ImageSourceConfigureSimulationOffline.lvclass
+++ b/ImageSourceConfigure/Simulation/Offline/ImageSourceConfigureSimulationOffline.lvclass