Merge branch '148-sync-submodules-to-last-v1-9-x-release-of-each-new-…

…ones' into 'master' Resolve "sync submodules to last v1.9.x release of each new ones" Closes #148 See merge request limagroup/lima!188
esrf-bliss · Jan 15, 2021 · 4c85e40 · 4c85e40
2 parents 6b2ae24 + f30327d
commit 4c85e40
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/applications/tango/python b/applications/tango/python
diff --git a/camera/basler b/camera/basler
diff --git a/camera/eiger b/camera/eiger
diff --git a/camera/frelon b/camera/frelon
diff --git a/camera/lambda b/camera/lambda
diff --git a/camera/maxipix b/camera/maxipix
diff --git a/camera/perkinelmer b/camera/perkinelmer
diff --git a/camera/pilatus b/camera/pilatus
diff --git a/camera/simulator b/camera/simulator
diff --git a/third-party/Processlib b/third-party/Processlib
+1 −0		.gitignore
+22 −0		.gitlab-ci.yml
+23 −13		LimaCCDs.py
+5 −0		README.md
+5 −4		doc/index.rst
+47 −41		plugins/BackgroundSubstraction.py
+4 −9		plugins/Bpm.py
+17 −4		plugins/Mask.py
+0 −4		plugins/Memcached.py
+0 −4		plugins/PeakFinder.py
+25 −11		plugins/Roi2Spectrum.py
+62 −10		plugins/RoiCounter.py
+40 −3		plugins/Utils.py
+4 −0		tests/test_import.py
+64 −0		tests/test_mask.py
+0 −2		conda/camera/conda_build_config.yaml
+0 −1		conda/camera/meta.yaml
+11 −3		doc/tango.rst
+4 −2		include/BaslerCamera.h
+2 −0		sip/BaslerCamera.sip
+71 −26		src/BaslerCamera.cpp
+28 −2		tango/Basler.py
+2 −0		.gitlab-ci.yml
+1 −9		conda/camera/meta.yaml
+7 −7		tango/Frelon.py
+0 −10		.gitlab-ci.yml
+17 −14		CMakeLists.txt
+0 −2		conda/camera/conda_build_config.yaml
+5 −3		conda/camera/meta.yaml
+1 −0		conda/tango/meta.yaml
+24 −38		include/LambdaCamera.h
+6 −19		python/__init__.py
+ −		sdk/bin/liblambda.so
+1 −0		sdk/bin/libxsp.so
+1 −0		sdk/bin/libxsp.so.1
+ −		sdk/bin/libxsp.so.1.3.1
+ −		sdk/bin/libxsp.so.1.3.2
+0 −198		sdk/include/fsdetector/core/FilesOperation.h
+0 −186		sdk/include/fsdetector/core/Globals.h
+0 −238		sdk/include/fsdetector/core/MemUtils.h
+0 −545		sdk/include/fsdetector/core/MemUtils.tpp
+0 −191		sdk/include/fsdetector/core/NetworkImplementation.h
+0 −197		sdk/include/fsdetector/core/NetworkInterface.h
+0 −130		sdk/include/fsdetector/core/ThreadUtils.h
+0 −88		sdk/include/fsdetector/core/Utils.h
+0 −8		sdk/include/fsdetector/core/Version.h
+0 −228		sdk/include/fsdetector/lambda/LambdaGlobals.h
+0 −345		sdk/include/fsdetector/lambda/LambdaInterface.h
+0 −384		sdk/include/fsdetector/lambda/LambdaSysImpl.h
+0 −8		sdk/include/fsdetector/lambda/Version.h
+350 −0		sdk/include/libxsp.h
+9 −6		sip/LambdaCamera.sip
+189 −286		src/LambdaCamera.cpp
+0 −12		src/LambdaInterface.cpp
+22 −7		tango/Lambda.py
+0 −2		conda/camera/conda_build_config.yaml
+1 −1		conda/camera/meta.yaml
+1 −0		conda/tango/meta.yaml
+4 −1		src/PriamAcq.cpp
+5 −12		CMakeLists.txt
+15 −0		cmake/FindXISL.cmake
+2 −0		conda/camera/meta.yaml
+5 −4		include/PerkinElmerBinCtrlObj.h
+0 −35		include/PerkinElmerCompatibility.h
+4 −3		include/PerkinElmerDetInfoCtrlObj.h
+5 −4		include/PerkinElmerInterface.h
+5 −4		include/PerkinElmerSyncCtrlObj.h
+5 −0		install.bat
+820 −0		sdk64/3.3.2.7/Acq.h
+ −		sdk64/3.3.2.7/XISL.dll
+ −		sdk64/3.3.2.7/XISL.lib
+1 −1		core/include/processlib/PoolThreadMgr.h
+1 −0		tasks/src/Rotation.cpp