Merge branch 'development' into guiactor

d8ef90a3 · Udo Eisenbarth · 662386da · 8516764e · d8ef90a3 · d8ef90a3
Commit d8ef90a3 authored 8 years ago by Udo Eisenbarth
--- a/ImageSourceBase/Imaqdx/Phytec/Set Configure.vi
+++ b/ImageSourceBase/Imaqdx/Phytec/Set Configure.vi
--- a/ImageSourceBase/Imaqdx/Phytec/Write Gain.vi
+++ b/ImageSourceBase/Imaqdx/Phytec/Write Gain.vi
--- a/ImageSourceBase/Imaqdx/Phytec/Write On_Off.vi
+++ b/ImageSourceBase/Imaqdx/Phytec/Write On_Off.vi
--- a/ImageSourceBase/Imaqdx/Phytec/Write Shutter.vi
+++ b/ImageSourceBase/Imaqdx/Phytec/Write Shutter.vi
--- a/ImageSourceBase/Imaqdx/Phytec/Write Trigger.vi
+++ b/ImageSourceBase/Imaqdx/Phytec/Write Trigger.vi
--- a/ImageSourceBase/Imaqdx/Read Buffer.vi
+++ b/ImageSourceBase/Imaqdx/Read Buffer.vi
--- a/ImageSourceBase/Imaqdx/Read Gain.vi
+++ b/ImageSourceBase/Imaqdx/Read Gain.vi
--- a/ImageSourceBase/Imaqdx/Read IMAQdx Session.vi
+++ b/ImageSourceBase/Imaqdx/Read IMAQdx Session.vi
--- a/ImageSourceBase/Imaqdx/Read Shutter.vi
+++ b/ImageSourceBase/Imaqdx/Read Shutter.vi
--- a/ImageSourceBase/Imaqdx/Read Timeout.vi
+++ b/ImageSourceBase/Imaqdx/Read Timeout.vi
--- a/ImageSourceBase/Imaqdx/Read Trigger.vi
+++ b/ImageSourceBase/Imaqdx/Read Trigger.vi
--- a/ImageSourceBase/Imaqdx/Read WaitNextFrame.vi
+++ b/ImageSourceBase/Imaqdx/Read WaitNextFrame.vi
--- a/ImageSourceBase/Imaqdx/Set AttributeDBL.vi
+++ b/ImageSourceBase/Imaqdx/Set AttributeDBL.vi
--- a/ImageSourceBase/Imaqdx/Set AttributeI64.vi
+++ b/ImageSourceBase/Imaqdx/Set AttributeI64.vi
--- a/ImageSourceBase/Imaqdx/Set AttributeString.vi
+++ b/ImageSourceBase/Imaqdx/Set AttributeString.vi
--- a/ImageSourceBase/Imaqdx/Set AttributeU32.vi
+++ b/ImageSourceBase/Imaqdx/Set AttributeU32.vi
--- a/ImageSourceBase/Imaqdx/Set Configure.vi
+++ b/ImageSourceBase/Imaqdx/Set Configure.vi
--- a/ImageSourceBase/Imaqdx/Write Camera Name.vi
+++ b/ImageSourceBase/Imaqdx/Write Camera Name.vi
--- a/ImageSourceBase/Imaqdx/Write Gain.vi
+++ b/ImageSourceBase/Imaqdx/Write Gain.vi
--- a/ImageSourceBase/Imaqdx/Write On_Off.vi
+++ b/ImageSourceBase/Imaqdx/Write On_Off.vi