7 Commits

Author SHA1 Message Date
Dhanya Maliakal
476d1b452f some changes 2015-07-10 16:04:29 +02:00
Dhanya Maliakal
fbfafb98fd small change 2015-07-03 16:10:04 +02:00
Dhanya Maliakal
89ad2112c6 difference between acquisition index and frame index 2015-03-12 12:25:23 +01:00
Maliakal Dhanya
52d3140a3a a version of receiver for gemma with bottom 2014-12-02 10:12:00 +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
7986746194 from private to protected 2014-09-15 16:33:57 +02:00
59fc6fbaf8 moved .h into include. Second round of cleaning 2014-09-10 09:39:11 +02:00