Commit Graph

2 Commits

Author SHA1 Message Date
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
sala 27780d02d8 cleaning the project 2014-09-10 09:19:35 +02:00