Sala Leonardo ce0b32b558 Merge branch 'eiger_receiver' into devel_leo ...

Conflicts:
	Makefile
	include/UDPInterface.h
	slsReceiver/Makefile
	slsReceiver/eigerReceiver/eigerReceiver.cpp
	slsReceiver/eigerReceiver/eigerReceiverDummy.cpp
	slsReceiver/eigerReceiver/eigerReceiverTest.cpp

2014-09-10 10:07:33 +02:00

..

circularFifo.h

cleaning the project

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

genericSocket.h

cleaning the project

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

gitInfoReceiver.h

cleaning the project

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

gitInfoReceiverTmp.h

cleaning the project

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

logger.h

cleaning the project

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

MySocketTCP.h

cleaning the project

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

receiver_defs.h

cleaning the project

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

RestHelper.h

moved .h into include. Second round of cleaning

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

sls_receiver_defs.h

cleaning the project

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

sls_receiver_funcs.h

cleaning the project

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

slsReceiver.h

moved .h into include. Second round of cleaning

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

slsReceiverTCPIPInterface.h

moved .h into include. Second round of cleaning

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

slsReceiverUDPFunctions.h

moved .h into include. Second round of cleaning

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

slsReceiverUsers.h

moved .h into include. Second round of cleaning

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

UDPBaseImplementation.h

moved .h into include. Second round of cleaning

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

UDPInterface.h

Merge branch 'eiger_receiver' into devel_leo

2014-09-10 10:07:33 +02:00

UDPRESTImplementation.h

moved .h into include. Second round of cleaning

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

UDPStandardImplementation.h

moved .h into include. Second round of cleaning

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

utilities.h

cleaning the project

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