50 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	11943c4b5c	merge insignificant conflicts	2017-08-10 11:19:36 +02:00
Dhanya Maliakal	39847c5db6	esrf bug, shut down socket, but being processed and object deleted, fixed	2017-08-09 17:25:23 +02:00
Dhanya Maliakal	557d190236	changes for rest implementation	2017-08-08 14:51:32 +02:00
Leonardo Sala	d827ccc115	backported changes implemented in 2.3.2.rest	2017-08-08 06:55:52 +02:00
Dhanya Maliakal	c0d6958e37	no changE	2017-08-04 15:40:21 +02:00
Dhanya Maliakal	429bf7f13d	updaterev	2017-08-04 14:20:21 +02:00
Dhanya Maliakal	5713cd6092	addin usleep to reduce cpu	2017-07-28 11:28:03 +02:00
Dhanya Maliakal	0fcf768772	basename for hdf5 fixes	2017-07-27 09:31:14 +02:00
Dhanya Maliakal	8a8e76e839	added usleep to remove the 100%cpu, removed a insignificant printout	2017-07-26 11:36:31 +02:00
Dhanya Maliakal	672c42a20e	some more changes to make file for automatic versioning	2017-07-10 11:20:26 +02:00
Dhanya Maliakal	14bba171e7	conflict gitversion	2017-07-03 17:45:06 +02:00
Dhanya Maliakal	460a44a9b1	made updatereceiver to actually update client in parameters that it can	2017-07-03 17:37:31 +02:00
Dhanya Maliakal	b03e35a8d6	sorted receiver client interface, more consistent	2017-07-03 13:31:17 +02:00
Dhanya Maliakal	f8c04a6a51	sorted the receiver client interface, more manageable	2017-06-30 18:17:33 +02:00
Dhanya Maliakal	a4c07ba9a0	added black background for reciever to see gray font better	2017-06-30 12:19:27 +02:00
Dhanya Maliakal	4b9a8c1dad	makefiles and versioning update complete	2017-06-29 17:10:28 +02:00
Dhanya Maliakal	6bfbb075c8	ensuring fiel permissions	2017-06-28 18:18:30 +02:00
Dhanya Maliakal	f4857355b6	fixed new header for eiger	2017-06-28 16:53:01 +02:00
Dhanya Maliakal	697fc5b85e	updaterev	2017-06-22 14:36:22 +02:00
Dhanya Maliakal	8d6ceccf87	updaterev	2017-06-14 11:38:28 +02:00
Dhanya Maliakal	7f01ccc83f	updaterev	2017-06-12 18:53:42 +02:00
Dhanya Maliakal	cacb4c9d93	updaterev	2017-03-24 13:42:11 +01:00
Dhanya Maliakal	e450f5ec6a	updaterev	2017-03-23 15:17:34 +01:00
Dhanya Maliakal	da8d535dae	updaterev	2017-03-23 14:09:01 +01:00
Dhanya Maliakal	54371bc6be	updaterev	2017-03-23 13:48:18 +01:00
Dhanya Maliakal	0814f6369d	udpaterev	2017-03-23 13:46:16 +01:00
Dhanya Maliakal	78958c7699	updaterev	2017-03-20 09:30:15 +01:00
Dhanya Maliakal	575c9617c7	fixed gui for new header	2017-03-20 09:28:15 +01:00
Dhanya Maliakal	1413244617	update rev	2017-03-15 15:02:28 +01:00
Dhanya Maliakal	a1f00518b8	updaterev	2017-02-10 11:50:24 +01:00
Dhanya Maliakal	ce086fe79d	updaterev	2016-11-30 11:20:42 +01:00
Dhanya Maliakal	21e4201bb8	updaterev	2016-11-14 11:57:57 +01:00
Dhanya Maliakal	c364b28922	updaterev	2016-11-11 14:14:59 +01:00
Dhanya Maliakal	149610aa51	updaterev	2016-11-09 10:21:20 +01:00
Dhanya Maliakal	0b5dc3a5a1	updaterev	2016-11-08 15:24:02 +01:00
Dhanya Maliakal	eeaaef1a99	updaterev	2016-11-03 12:33:14 +01:00
Dhanya Maliakal	01ed24263f	updaterev	2016-09-29 10:29:24 +02:00
Dhanya Maliakal	8eea853a9a	updaterev	2016-08-30 16:13:24 +02:00
Dhanya Maliakal	e452bccea2	updaterev	2016-08-12 11:18:11 +02:00
Dhanya Maliakal	c852463de1	updaterev	2016-07-18 18:18:08 +02:00
Dhanya Maliakal	eda342911f	update versions	2016-07-14 16:23:29 +02:00
Dhanya Maliakal	779d8d1094	updating versions	2016-07-06 10:32:58 +02:00
Dhanya Maliakal	347ecb9bb5	updating versions	2016-07-05 17:24:45 +02:00
Dhanya Maliakal	980c1c02e6	updating versions	2016-07-05 17:23:05 +02:00
Dhanya Maliakal	df04d9fb07	updating versions	2016-07-04 15:51:18 +02:00
Dhanya Maliakal	d88253f643	versions update	2016-06-13 19:10:14 +02:00
Dhanya Maliakal	3600fb6304	git rev in	2015-06-29 16:57:16 +02:00
Dhanya Maliakal	237c5286ca	includes dynamic range in offline headers for eiger	2015-06-26 11:49:26 +02: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