Martin Brückner b27f691d03 Revert "Solved merge conflicts" ...

This reverts commit c222221d18bd5db7d9a8c86071fe2fbdc0ce25ac.

2015-06-11 11:30:40 +02:00

..

ansi.h

fifo debug with color done

2015-03-05 15:21:12 +01:00

circularFifo.h

cleaning the project

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

dummyUDPInterface.h

added dunny implementation as an example to combine TCPIP interface and custom UDP reciever

2015-04-21 15:09:50 +02:00

genericSocket.h

Revert "Solved merge conflicts"

2015-06-11 11:30:40 +02:00

gitInfoReceiver.h

Merge branch 'master' into eiger_receiver

2014-11-11 15:54:12 +01:00

gitInfoReceiverTmp.h

cleaning the project

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

logger.h

added log level control

2014-11-18 10:51:52 +01:00

MySocketTCP.h

cleaning the project

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

receiver_defs.h

added dunny implementation as an example to combine TCPIP interface and custom UDP reciever

2015-04-21 15:09:50 +02:00

RestHelper.h

test

2015-03-23 11:41:19 +01:00

sls_receiver_defs.h

Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software

2015-03-06 10:43:22 +01:00

sls_receiver_funcs.h

Merge branch 'master' into eiger_receiver

2014-11-11 15:54:12 +01:00

slsReceiver.h

moved .h into include. Second round of cleaning

2014-09-10 09:39:11 +02:00

slsReceiverTCPIPInterface.h

Merge branch 'master' into eiger_receiver

2014-11-11 15:54:12 +01:00

slsReceiverUsers.h

moved .h into include. Second round of cleaning

2014-09-10 09:39:11 +02:00

UDPBaseImplementation.h

not much valuable change

2015-06-10 12:23:38 +02:00

UDPInterface.h

starting receiver only at set detector type works

2015-05-21 17:39:17 +02:00

UDPRESTImplementation.h

difference between acquisition index and frame index

2015-03-12 12:25:23 +01:00

UDPStandardImplementation.h

difference between acquisition index and frame index

2015-03-12 12:25:23 +01:00

utilities.h

able to send data to eigerbe

2014-09-17 15:56:27 +02:00