-
claustre authored
Conflicts: include/AndorCamera.h include/AndorDetInfoCtrlObj.h sip/AndorCamera.sip src/AndorCamera.cpp src/AndorDetInfoCtrlObj.cpp
6113a124
Conflicts: include/AndorCamera.h include/AndorDetInfoCtrlObj.h sip/AndorCamera.sip src/AndorCamera.cpp src/AndorDetInfoCtrlObj.cpp