6 Commits

Author	SHA1	Message	Date
Anna Bergamaschi	cd67991357	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software	2015-03-06 10:43:22 +01:00
Anna Bergamaschi	c7aea8f2a6	Some changes for the JCTB software	2015-03-06 10:43:05 +01:00
Dhanya Maliakal	2f82469531	fifo debug with color done	2015-03-05 15:21:12 +01:00
Anna Bergamaschi	1d5580b0d4	JMCB max frames	2014-11-25 11:54:54 +01:00
Leonardo 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 Leonardo	27780d02d8	cleaning the project	2014-09-10 09:19:35 +02:00