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

..

include

Merge branch 'eiger_receiver' into devel_leo

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

slsReceiver

Merge branch 'eiger_receiver' into devel_leo

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

src

moved .h into include. Second round of cleaning

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

test

moved .h into include. Second round of cleaning

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

.gitignore

moved .h into include. Second round of cleaning

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

gitInfo.txt

git version history

2014-06-03 13:56:16 +02:00

Makefile

Merge branch 'eiger_receiver' into devel_leo

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

slsReceiverUsers.doxy

added receiver interface, have not separated from eigerDummyReceiver yet

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