Commit Graph

5 Commits

Author SHA1 Message Date
a2fdcce711 fixed non-rest compilation 2014-11-17 17:06:50 +01:00
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
e5864d4343 Added status resetting for REST 2014-09-22 11:45:01 +02:00
cfacc6ad6e modified to support REST receiver, still not properly working 2014-09-15 16:52:53 +02:00
27780d02d8 cleaning the project 2014-09-10 09:19:35 +02:00