Commit Graph
2 Commits
Author SHA1 Message Date
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
sala 59fc6fbaf8 moved .h into include. Second round of cleaning 2014-09-10 09:39:11 +02:00