• Locatelli's avatar
    Merge remote-tracking branch 'origin/V3.2_191' into ploty2 · 9e463c4a
    Locatelli authored
    Conflicts:
    	src/controllers/lss/d22special/gui/nomadd22specialgui.jar
    	src/controllers/remotedielectricswindeta/DielectricsRemoteWindeta.cpp
    	src/controllers/remotenanokin/RemoteNanokin.cpp
    	src/controllers/remotenanokin/RemoteNanokin.h
    	src/controllers/vexp/VEXPController.cpp
    	src/drivers/caen/caen_cfd2/RealCAENCfd2Driver.cpp
    	src/drivers/gigecam/photonics/CameraHandler.cpp
    	src/drivers/gigecam/photonics/CameraHandler.h
    	src/drivers/gigecam/photonics/RealPhotonicsDriver.cpp
    	src/drivers/gigecam/photonics/RealPhotonicsDriver.h
    9e463c4a