Dhanya Thattil b58c3e8951 solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

..

gitInfoLib.h

solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

gitInfoLibTmp.h

changed all variables from svn to git, included --version for receiver binary

2017-12-06 10:29:57 +01:00

remove_shm.sh

some debugging at the beamline (fnames)

2013-05-14 10:26:28 +00:00

slsDetector.cpp

solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

slsDetector.h

solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

slsDetectorActions.cpp

resolved warnings, also from esrf: todo: include changes in zmq

2017-05-01 13:11:10 +02:00

slsDetectorActions.h

changes for setting threshold without trimbits for eiger

2017-06-28 10:24:07 +02:00

slsDetectorBase.h

only call register call back which already enables streaming in client and receiver, added to postprocessing

2017-11-28 09:36:54 +01:00

slsDetectorCommand.cpp

solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

slsDetectorCommand.h

temp_threshold, temp_control, temp_event done

2018-01-11 15:37:24 +01:00

slsDetectorUsers.cpp

zmqip in users fixed

2017-11-28 10:33:40 +01:00

slsDetectorUsers.h

comment users

2017-11-28 10:51:05 +01:00

slsDetectorUtils.cpp

Merge branch '3.0.1' into developer

2017-12-05 13:41:26 +01:00

slsDetectorUtils.h

solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00