2636 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Thattil	9833a7d330	Merge branch 'main-rc' into b2.3.1 2.3.1	2020-11-30 16:25:23 +01:00
Dhanya Thattil	8f9155e578	Merge branch 'main-rc' into b2.3.0 2.3.0	2020-11-30 16:23:50 +01:00
Dhanya Thattil	9df1eac3c1	Merge branch 'main-rc' into b2.2.0 2.2.0	2020-11-30 15:46:45 +01:00
Dhanya Thattil	5ededf9be4	Merge branch 'main-rc' into b2.1.1 2.1.1	2020-11-30 15:16:57 +01:00
Dhanya Thattil	3e8774798a	Merge branch 'main-rc' into b2.1.0 2.1.0	2020-11-30 15:13:43 +01:00
Dhanya Maliakal	e658cbacda	Merge remote branch 'slsDetectorCalibration/2.3.1' into 2.3.1	2017-12-12 11:14:08 +01:00
Dhanya Maliakal	1e6c6dea71	Merge remote branch 'slsDetectorCalibration/2.3' into 2.3	2017-12-12 11:14:05 +01:00
Dhanya Maliakal	0e5d4d1d8e	Merge remote branch 'slsDetectorCalibration/2.2' into 2.2	2017-12-12 11:14:01 +01:00
Dhanya Maliakal	a2986784d3	Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1	2017-12-12 11:13:34 +01:00
Dhanya Maliakal	975cbb576e	Merge remote branch 'slsDetectorCalibration/2.1' into 2.1	2017-12-12 11:06:15 +01:00
Dhanya Maliakal	e48a92d9cd	Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5 2.0.5	2017-12-12 11:02:57 +01:00
Dhanya Maliakal	4142328437	Merge remote branch 'slsDetectorGui/2.3.1' into 2.3.1	2017-12-04 16:47:41 +01:00
Dhanya Maliakal	6c797988c7	Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1	2017-12-04 16:47:41 +01:00
Dhanya Maliakal	215c262981	Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1	2017-12-04 16:47:39 +01:00
Dhanya Maliakal	081b809078	Merge remote branch 'slsDetectorGui/2.3' into 2.3	2017-12-04 16:47:35 +01:00
Dhanya Maliakal	9263567cd8	Merge remote branch 'slsReceiverSoftware/2.3' into 2.3	2017-12-04 16:47:34 +01:00
Dhanya Maliakal	58e90a85be	Merge remote branch 'slsDetectorSoftware/2.3' into 2.3	2017-12-04 16:47:33 +01:00
Dhanya Maliakal	025c836e25	Merge remote branch 'slsDetectorGui/2.2' into 2.2	2017-12-04 16:47:28 +01:00
Dhanya Maliakal	5d5abae3f4	Merge remote branch 'slsReceiverSoftware/2.2' into 2.2	2017-12-04 16:47:28 +01:00
Dhanya Maliakal	e2ad46386e	Merge remote branch 'slsDetectorSoftware/2.2' into 2.2	2017-12-04 16:47:26 +01:00
Dhanya Maliakal	308d44e452	Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1	2017-12-04 16:47:22 +01:00
Dhanya Maliakal	69da61b1fb	Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1	2017-12-04 16:47:22 +01:00
Dhanya Maliakal	460168ce04	Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1	2017-12-04 16:47:21 +01:00
Dhanya Maliakal	4e429c0d77	Merge remote branch 'slsDetectorGui/2.1' into 2.1	2017-12-04 16:45:34 +01:00
Dhanya Maliakal	bf4fab549d	Merge remote branch 'slsReceiverSoftware/2.1' into 2.1	2017-12-04 16:45:34 +01:00
Dhanya Maliakal	f7705eb1da	Merge remote branch 'slsDetectorSoftware/2.1' into 2.1	2017-12-04 16:45:32 +01:00
Dhanya Maliakal	a2217e2066	Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5	2017-12-04 15:33:33 +01:00
Dhanya Maliakal	aaa02706fc	Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5	2017-12-04 15:31:52 +01:00
Dhanya Maliakal	9468b9ca1e	updaterev	2017-04-11 13:39:59 +02:00
Dhanya Maliakal	d7982e178e	updaterev	2017-04-11 13:39:53 +02:00
Dhanya Maliakal	9cf5714a5b	removing warnings shown from esrf debian	2017-04-11 13:39:35 +02:00
Dhanya Maliakal	0c9ac8911a	removing warnings shown from esrf debian	2017-04-11 13:39:28 +02:00
Dhanya Maliakal	4730c8c0a9	updaterev	2017-04-11 13:31:49 +02:00
Dhanya Maliakal	43efb8acfd	removing warnings shown from esrf debian	2017-04-11 13:31:32 +02:00
Dhanya Maliakal	6ecca8fcb0	updaterev	2017-04-11 09:03:26 +02:00
Dhanya Maliakal	17cb63a57f	updaterev	2017-04-11 09:03:19 +02:00
Dhanya Maliakal	4f83fcb001	updaterev	2017-04-11 09:02:10 +02:00
Dhanya Maliakal	ab94af6d29	removed verbose etc	2017-04-07 15:08:40 +02:00
Dhanya Maliakal	7c725cc69b	.c_str() must not access global variables from thread	2017-04-07 14:57:19 +02:00
Dhanya Maliakal	f0198d2d2e	alejandro's changes from ESRF	2017-04-07 14:50:17 +02:00
Dhanya Maliakal	5ddccbdee4	changed all -lpthread to -pthread	2017-04-07 14:28:00 +02:00
Dhanya Maliakal	8fb39b8c7e	changed all -lpthread to -pthread	2017-04-07 14:27:27 +02:00
Dhanya Maliakal	bd5293f4b1	changed all -lpthread to -pthread	2017-04-07 14:26:09 +02:00
Dhanya Maliakal	b91180f5b2	changed all -lpthread to -pthread	2017-04-07 14:26:03 +02:00
Dhanya Maliakal	7c3b5065a5	changed all -lpthread to -pthread	2017-04-07 14:25:09 +02:00
Dhanya Maliakal	9aef802bea	changed all -lpthread to -pthread	2017-04-07 14:24:49 +02:00
Dhanya Maliakal	f7d85231f2	solved warnings except sscanf for uint64_t	2017-04-07 14:12:21 +02:00
Dhanya Maliakal	5b3a911e8d	solved warnings except sscanf for uint64_t	2017-04-07 14:11:34 +02:00
Dhanya Maliakal	65f5e1c1ab	strtok is not thread safe..used to set receiver udp ip etc to detector, fixed	2017-04-06 15:04:33 +02:00
Gemma Tinti	1afb9e3e48	manual	2017-03-29 11:23:44 +02:00