349 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	fecac2c4d2	Merge branch '3.0-rc' into developer	2017-08-17 17:10:52 +02:00
Dhanya Maliakal	9167d113dc	command line doc. done	2017-08-17 17:10:32 +02:00
Dhanya Maliakal	04ebc85fcc	command line doc. done	2017-08-17 17:09:59 +02:00
Dhanya Maliakal	7cfc6a9fd9	Merge branch '3.0-rc' into developer	2017-08-17 17:09:04 +02:00
Dhanya Maliakal	e0c29190a2	command line doc. done	2017-08-17 17:08:55 +02:00
Dhanya Maliakal	68840b4544	Merge branch '3.0-rc' into developer	2017-08-17 16:50:18 +02:00
Dhanya Maliakal	e2af1de83f	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc	2017-08-17 16:49:54 +02:00
Dhanya Maliakal	7156d2e7b3	updated client docu. more coming up	2017-08-17 16:49:48 +02:00
Gemma Tinti	c3fce9822f	Merge branch '3.0-rc' into developer	2017-08-17 16:40:35 +02:00
Gemma Tinti	ca02a8fd72	manual	2017-08-17 16:39:48 +02:00
Dhanya Maliakal	3c3a5062bd	Merge branch '3.0-rc' into developer	2017-08-17 16:25:05 +02:00
Dhanya Maliakal	edfa8493d8	command line docu. more coming up	2017-08-17 16:25:04 +02:00
Dhanya Maliakal	96700d42b4	Merge branch '3.0-rc' into developer	2017-08-17 14:34:24 +02:00
Dhanya Maliakal	56e61de863	command line docu. more coming up	2017-08-17 14:34:09 +02:00
Dhanya Maliakal	2932a954ab	Merge branch '3.0-rc' into developer	2017-08-17 14:32:46 +02:00
Dhanya Maliakal	de7bb0b979	command line docu. more coming up	2017-08-17 14:32:45 +02:00
Dhanya Maliakal	80c8ff9f20	Merge branch '3.0-rc' into developer	2017-08-17 14:17:16 +02:00
Dhanya Maliakal	3da71c9274	command line docu. more coming up	2017-08-17 14:17:10 +02:00
Dhanya Maliakal	b9cd0054a9	Merge branch '3.0-rc' into developer	2017-08-17 13:56:09 +02:00
Dhanya Maliakal	cf5137723d	command line docu update. more coming	2017-08-17 13:56:00 +02:00
Dhanya Maliakal	94e3874545	docu for bug fix eiger serbver	2017-08-17 12:07:57 +02:00
Dhanya Maliakal	c6c0819a5e	Merge branch '3.0-rc' into developer	2017-08-16 19:06:24 +02:00
Dhanya Maliakal	45681f86ce	update client command doc	2017-08-16 19:06:17 +02:00
Dhanya Maliakal	50c5c12523	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer	2017-08-16 19:05:42 +02:00
Dhanya Maliakal	4f773120b2	Merge branch '3.0-rc' into developer	2017-08-16 19:05:36 +02:00
Gemma Tinti	0bbee8d91e	Merge branch '3.0-rc' into developer	2017-08-16 18:21:01 +02:00
Gemma Tinti	24d6d2c24a	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc	2017-08-16 18:18:48 +02:00
Gemma Tinti	28e9605ab7	eiger documentation	2017-08-16 18:18:31 +02:00
Dhanya Maliakal	87abe15227	Merge branch '3.0-rc' into developer	2017-08-16 17:28:09 +02:00
Dhanya Maliakal	4b7970c191	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc	2017-08-16 17:23:50 +02:00
Dhanya Maliakal	3cf092d058	updating cmd line help	2017-08-16 17:23:37 +02:00
Gemma Tinti	2b030abf0d	sync eiger manual	2017-08-16 16:32:53 +02:00
Dhanya Maliakal	83bb7c99ea	removed gotthard server binary..was for developer branch	2017-08-16 16:05:53 +02:00
Dhanya Maliakal	24d0d776b7	new gotthard server binary	2017-08-16 16:04:47 +02:00
Dhanya Maliakal	eaed8bab08	Merge branch '3.0-rc' into developer	2017-08-16 11:50:13 +02:00
Dhanya Maliakal	3c59b3b8dd	updated command line doc	2017-08-16 11:50:01 +02:00
Dhanya Maliakal	8bc039c95f	updated command line doc	2017-08-16 11:13:32 +02:00
Dhanya Maliakal	b0b3701fcf	moved the output dir of slsdetectorClientDocs	2017-08-16 11:11:26 +02:00
Dhanya Maliakal	c489aeb9dc	moved the output dir of slsdetectorClientDocs	2017-08-16 11:11:13 +02:00
Dhanya Maliakal	193139f06f	Merge branch '3.0-rc' into developer	2017-08-15 18:08:01 +02:00
Dhanya Maliakal	6a2c0ac86d	added command line documentation in release.txt	2017-08-15 18:06:20 +02:00
Dhanya Maliakal	02b6228856	updated eiger server	2017-08-15 13:59:03 +02:00
Dhanya Maliakal	bcf5e1fc0b	updated server binary	2017-08-14 15:07:36 +02:00
Dhanya Maliakal	92ae104f39	Merge branch '3.0-rc' into developer	2017-08-10 18:46:42 +02:00
Dhanya Maliakal	1a313e4d5d	moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix	2017-08-10 18:46:21 +02:00
Dhanya Maliakal	cb90c3722d	esrf bug, shut down socket, but being processed and object deleted, fixed	2017-08-09 17:24:34 +02:00
Gemma Tinti	851914f0ae	manuals	2017-08-08 20:04:28 +02:00
Gemma Tinti	e85973ec8b	manuals	2017-08-08 19:48:32 +02:00
Dhanya Maliakal	82d21b6971	changes to release.txt to include busy command and the frameindex bugfix	2017-08-08 19:13:22 +02:00
Dhanya Maliakal	ccc60dacf4	updated release.txt and the cmk.sh help script	2017-08-08 16:24:33 +02:00