Commit Graph

363 Commits

Author SHA1 Message Date
Dhanya Maliakal ca756dbeee Merge branch '3.0' into developer 2017-08-22 19:40:47 +02:00
Dhanya Maliakal 760ca98ee4 updating user documentation. another update required 2017-08-22 19:40:20 +02:00
Dhanya Maliakal 4dd7cafe32 Merge branch '3.0' into developer 2017-08-21 09:21:41 +02:00
Dhanya Maliakal 5b80ef6d04 changes to release 2017-08-18 18:35:04 +02:00
Dhanya Maliakal de3c62fea4 Merge branch '3.0-rc' into developer 2017-08-18 16:13:51 +02:00
Dhanya Maliakal 4b6144c489 updated server binaries 2017-08-18 16:13:33 +02:00
Dhanya Maliakal 4838d6c037 updated server binaries 2017-08-18 16:13:09 +02:00
Dhanya Maliakal c1ea73d21c some changes for release txt 2017-08-18 14:03:11 +02:00
Dhanya Maliakal ed8e41a02c Merge branch '3.0-rc' into developer 2017-08-17 17:24:30 +02:00
Dhanya Maliakal 37f881017a updating command line docu. 2017-08-17 17:24:20 +02:00
Dhanya Maliakal c87cb5d051 Merge branch '3.0-rc' into developer 2017-08-17 17:16:59 +02:00
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 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