Dhanya Thattil b58c3e8951 solving merging conflicts from 3.1.0 to developer

2018-03-14 15:45:35 +01:00

..

manual-api

Merge branch '3.0.1' into developer

2017-12-14 14:29:16 +01:00

manual-calwiz

updating user documentation. another update required

2017-08-22 19:40:20 +02:00

manual-client

eiger manual

2018-01-19 16:05:15 +01:00

manual-gui

updating user documentation. another update required

2017-08-22 19:40:20 +02:00

manual-main

sls detector install omitted, added

2018-03-12 15:36:36 +01:00

index.html

some docs

2012-12-04 15:36:02 +00:00

Makefile

updated manuals

2018-02-09 11:25:21 +01:00