Dhanya Thattil b58c3e8951 solving merging conflicts from 3.1.0 to developer

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

..

.cproject

cleaning the project

2014-09-10 09:19:35 +02:00

.project

cleaning the project

2014-09-10 09:19:35 +02:00

BinaryFile.cpp

merge ocnflict for white background

2017-11-28 11:29:15 +01:00

DataProcessor.cpp

merge conflict resolved

2017-12-01 12:44:34 +01:00

DataStreamer.cpp

merge conflict resolved

2017-12-01 12:44:34 +01:00

Fifo.cpp

minor cosmetics

2017-12-01 11:23:17 +01:00

File.cpp

gap pixels for 8, 16, 32 in receiver at udp level

2017-10-05 15:59:07 +02:00

HDF5File.cpp

merge ocnflict for white background

2017-11-28 11:29:15 +01:00

HDF5FileStatic.cpp

in between stage

2017-04-04 11:20:38 +02:00

Listener.cpp

fix in receiver merge conflict (before the respos merge)

2017-12-04 18:35:57 +01:00

main.cpp

made the color fix for black/white backgrounds

2017-12-14 14:29:07 +01:00

MySocketTCP.cpp

cleaning the project

2014-09-10 09:19:35 +02:00

slsReceiver.cpp

possible to use binary --version or -v to get the branch and versionid

2017-12-06 19:05:35 +01:00

slsReceiverTCPIPInterface.cpp

solving merging conflicts from 3.1.0 to developer

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

slsReceiverUsers.cpp

can set zmqport from receiver, ensured proper destructors, and ctrl c should kill it

2017-07-13 12:17:49 +02:00

ThreadObject.cpp

minor cosmetics

2017-12-01 11:23:17 +01:00

UDPBaseImplementation.cpp

merge conflict resolved

2017-12-01 12:44:34 +01:00

UDPInterface.cpp

REST implementation removed from slsReceiver

2017-12-05 11:03:52 +01:00

UDPStandardImplementation.cpp

Merge branch '3.0.1' into developer

2017-12-14 14:29:16 +01:00

utilities.cpp

made the color fix for black/white backgrounds

2017-12-14 14:29:07 +01:00