salaandManuel Guizar 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

..

include

Merge branch 'master' into eiger_receiver

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

src

Merge branch 'master' into eiger_receiver

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

test

moved .h into include. Second round of cleaning

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

.gitignore

added build dir

2014-09-12 13:25:01 +02:00

gitInfo.txt

the version given to esrf

2014-10-16 14:14:20 +02:00

Makefile

added log printouts. Added hardcoded REST configuration

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

slsReceiverUsers.doxy

added receiver interface, have not separated from eigerDummyReceiver yet

2014-07-18 12:27:32 +02:00