Leonardo Sala 7c51b06777 Merge branch 'master' into eiger_receiver ...

Conflicts:
	include/slsReceiverTCPIPInterface.h
	slsReceiver/slsReceiver.cpp
	src/UDPStandardImplementation.cpp
	src/slsReceiverTCPIPInterface.cpp

it compiles

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

..

circularFifo.h

cleaning the project

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

genericSocket.h

Merge branch 'master' into eiger_receiver

2014-11-11 15:54:12 +01: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

able to send data to eigerbe

2014-09-17 15:56:27 +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

added log printouts. Added hardcoded REST configuration

2014-11-05 11:44:00 +01:00

sls_receiver_defs.h

Merge branch 'master' into eiger_receiver

2014-11-11 15:54:12 +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

slsReceiverUDPFunctions.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

Merge branch 'master' into eiger_receiver

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

UDPInterface.h

Merge branch 'master' into eiger_receiver

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

UDPRESTImplementation.h

Merge branch 'master' into eiger_receiver

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

UDPStandardImplementation.h

Merge branch 'master' into eiger_receiver

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

utilities.h

able to send data to eigerbe

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