Merge branch 'before-v1.8.0' into 'master'

Update every submodules before release See merge request limagroup/lima!119
esrf-bliss · Feb 8, 2019 · 39540d3 · 39540d3
2 parents 404b7c4 + e116072
commit 39540d3
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 20 deletions.
diff --git a/camera/andor b/camera/andor
diff --git a/camera/andor3 b/camera/andor3
diff --git a/camera/basler b/camera/basler
diff --git a/camera/common/espia b/camera/common/espia
diff --git a/camera/common/meta b/camera/common/meta
diff --git a/camera/eiger b/camera/eiger
diff --git a/camera/frelon b/camera/frelon
diff --git a/camera/maxipix b/camera/maxipix
diff --git a/camera/pco b/camera/pco
diff --git a/camera/pilatus b/camera/pilatus
diff --git a/camera/pointgrey b/camera/pointgrey
diff --git a/camera/prosilica b/camera/prosilica
diff --git a/camera/roperscientific b/camera/roperscientific
diff --git a/camera/simulator b/camera/simulator
diff --git a/camera/slsdetector b/camera/slsdetector
diff --git a/camera/ueye b/camera/ueye
diff --git a/camera/v4l2 b/camera/v4l2
diff --git a/camera/xh b/camera/xh
diff --git a/camera/xspress3 b/camera/xspress3
diff --git a/camera/zwo b/camera/zwo
+30 −0		README.md
+1 −0		conda/camera/conda_build_config.yaml
+2 −0		sip/AndorCamera.sip
+0 −1		README
+31 −0		README.md
+1 −0		conda/camera/conda_build_config.yaml
+3 −1		sip/Andor3Camera.sip
+27 −3		README.md
+1 −1		conda/tango/meta.yaml
+2 −0		sip/MetaInterface.sip
+7 −7		tango/MetaMaxipix5.py
+6 −4		CMakeLists.txt
+30 −0		README.md
+1 −1		conda/camera/build.sh
+1 −0		conda/camera/conda_build_config.yaml
+1 −0		conda/camera/conda_build_config.yaml
+2 −4		sip/PcoCamera.sip
+1 −1		CMakeLists.txt
+23 −12		README.md
+0 −6		conda/camera/meta.yaml
+11 −0		conda/camera/run_test.py
+9 −1		tango/Simulator.py
+4 −0		test/CMakeLists.txt
+8 −0		test/test.py