3353 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	70a55428bc	removed 2 files in doxygen always generated	2017-08-17 17:16:41 +02:00
Dhanya Maliakal	8c0b4ac216	Merge branch '3.0-rc' into developer	2017-08-17 17:13:40 +02:00
Dhanya Maliakal	60292ca0f8	added to .gitignore	2017-08-17 17:13:30 +02:00
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	de5986e5dd	Merge branch '3.0-rc' into developer	2017-08-17 17:09:05 +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
Anna Bergamaschi	ff7b6c5abe	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc	2017-08-17 17:04:57 +02:00
Dhanya Maliakal	269227b093	Merge branch '3.0-rc' into developer	2017-08-17 17:04:30 +02:00
Dhanya Maliakal	355c0a8c11	command line docu. more coming up	2017-08-17 17:04:29 +02:00
Anna Bergamaschi	be95de0963	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc	2017-08-17 17:04:27 +02:00
Anna Bergamaschi	0dd6567ce4	changed some sections in the documentation	2017-08-17 17:04:07 +02:00
Dhanya Maliakal	638a69ad23	Merge branch '3.0-rc' into developer	2017-08-17 17:02:43 +02:00
Dhanya Maliakal	7115ac19b6	command line docu. more coming up	2017-08-17 17:02:42 +02:00
Dhanya Maliakal	b20f994ac4	Merge branch '3.0-rc' into developer	2017-08-17 16:59:08 +02:00
Dhanya Maliakal	4adf3e9385	command line docu. more coming up	2017-08-17 16:59:07 +02:00
Anna Bergamaschi	ae13fbce72	changed some sections in the documentation	2017-08-17 16:57:06 +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
Dhanya Maliakal	e2d451a400	Merge branch '3.0-rc' into developer	2017-08-17 16:46:49 +02:00
Dhanya Maliakal	3189bd5359	command line docu. more coming up	2017-08-17 16:46: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	52223e61d4	Merge branch '3.0-rc' into developer	2017-08-17 16:25:02 +02:00
Dhanya Maliakal	827ce17fac	command line docu. more coming up	2017-08-17 16:25:01 +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	6ef4aa9715	Merge branch '3.0-rc' into developer	2017-08-17 14:32:44 +02:00
Dhanya Maliakal	e333eb15cd	command line docu. more coming up	2017-08-17 14:32:43 +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	3a887eb604	Merge branch '3.0-rc' into developer	2017-08-17 14:17:05 +02:00
Dhanya Maliakal	c6549694a8	command line docu. more coming up	2017-08-17 14:16:54 +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	945a7ed10f	Merge branch '3.0-rc' into developer	2017-08-17 13:55:52 +02:00
Dhanya Maliakal	5ef0012518	command line docu update. more coming	2017-08-17 13:55:44 +02:00
Dhanya Maliakal	94e3874545	docu for bug fix eiger serbver	2017-08-17 12:07:57 +02:00
Dhanya Maliakal	722fb58010	bugfix:trimval gave first pixel value and not -1 if all are different	2017-08-17 12:04:54 +02:00
Dhanya Maliakal	d63933b2de	fixed 9m hv	2017-08-17 11:09:26 +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