Commit Graph

401 Commits

Author SHA1 Message Date
Dhanya Maliakal 673b7f1652 merge conflict fixed with developer 2017-10-19 15:36:28 +02:00
Dhanya Maliakal c755a5b602 bug fix to release.txt from the merge 2017-10-19 14:41:46 +02:00
Dhanya Maliakal 4aa0c8e24e Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1 2017-10-17 12:14:40 +02:00
maliakal_d 91588ecc21 Merge branch 'developer' into gappixels 2017-10-12 14:58:25 +02:00
Gemma Tinti 40cb2993fb eiger manual 2017-10-12 12:15:43 +02:00
Dhanya Maliakal 948eb455e2 editing release text, in between, need to still fix eiger server with new eror status functionality 2017-10-10 12:15:04 +02:00
Dhanya Maliakal fc025bd28b conflict resolution with developer 2017-10-03 15:12:35 +02:00
Dhanya Maliakal 907ab2f0bd changes upto the receiver, not incl gui 2017-10-03 10:43:47 +02:00
Dhanya Maliakal e51d178eaa added silent mode functionality and modified users class for it, updated manuals 2017-09-27 10:18:20 +02:00
l_msdetect 1c3b9c603c manual 2017-09-21 20:26:35 +02:00
Dhanya Maliakal 378f4f0891 updated release doc 2017-09-20 18:59:48 +02:00
Dhanya Maliakal 850ae77b43 in between modifying release.txt 2017-09-19 17:32:02 +02:00
Dhanya Maliakal 6b6ad6efe0 added one without call back 2017-09-19 16:47:56 +02:00
Dhanya Maliakal ae066fab93 modified userReceiver to make it work 2017-09-19 16:33:05 +02:00
Dhanya Maliakal be37e315c9 compile with gdb flag 2017-09-01 12:01:35 +02:00
Dhanya Maliakal 7099bc3286 removed users folder, redundant as user documentation in manual-api 2017-08-28 14:17:10 +02:00
Dhanya Maliakal 35dcdd62c9 links to libraries in manual 2017-08-28 14:15:57 +02:00
Gemma Tinti ad4fdcfa1a eiger manual 2017-08-26 13:32:00 +02:00
Gemma Tinti 2efe9cd40b Eiger manual 2017-08-26 09:01:56 +02:00
Gemma Tinti 07594e0607 eiger manual 2017-08-25 16:14:53 +02:00
Dhanya Maliakal c4c063534e update user doc 2017-08-25 15:56:30 +02:00
Dhanya Maliakal 705e1a762c updating user documentation 2017-08-25 15:46:42 +02:00
Dhanya Maliakal 0de9682e72 Merge branch '3.0' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0 2017-08-25 15:45:37 +02:00
Dhanya Maliakal ce0aa98b3f updated users documentation 2017-08-25 15:42:56 +02:00
Gemma Tinti 57fee3d5ef eiger manual 2017-08-25 14:24:42 +02:00
Dhanya Maliakal 891e76af0a gotthard bug fix documented 2017-08-25 12:22:40 +02:00
Dhanya Maliakal 67e92fdf68 Merge branch '3.0' into developer 2017-08-25 12:08:26 +02:00
Dhanya Maliakal 13186e1ee2 modified examples 2017-08-25 12:08:14 +02:00
Dhanya Maliakal 14f97cbc10 Merge branch '3.0' into developer 2017-08-24 18:42:32 +02:00
Dhanya Maliakal 6d2072f198 removed unnecessary print in makefile for manual 2017-08-24 18:41:56 +02:00
Dhanya Maliakal 319d883880 modified user example in manual/manual-api and regenerated documentation 2017-08-24 16:47:27 +02:00
Dhanya Maliakal 598d163173 new gotthard server in bin 2017-08-24 16:02:51 +02:00
Dhanya Maliakal 6f09a5abff Merge branch 'developer' into 3.0 2017-08-24 14:09:36 +02:00
Xiaoqiang Wang 634fbc748e compile libraries with -fPIC flag 2017-08-23 16:13:36 +02:00
Gemma Tinti 8fde83499e Merge branch '3.0' into developer 2017-08-23 12:10:29 +02:00
Gemma Tinti 5e90386fda manual 2017-08-23 12:09:42 +02:00
Dhanya Maliakal 33894509e6 Merge branch '3.0' into developer 2017-08-23 09:41:26 +02:00
Dhanya Maliakal 02f4b5f546 manual-main fixed, detaildoc not, but for developers and in next release 2017-08-23 09:40:53 +02:00
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