Dhanya Maliakal 28e2ebf75a merge conflict resolved from 3.0.1

2017-11-17 09:40:42 +01:00

..

client

fixed segmentation fault issue of xputsn the right way, fixed warnings

2017-11-17 09:26:05 +01:00

forms

merge conflict resolved from 3.0.1

2017-11-17 09:40:42 +01:00

images

made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi

2013-02-26 08:34:47 +00:00

include

merge conflict resolved from 3.0.1

2017-11-17 09:40:42 +01:00

slsDetectorPlotting

fixed the double plot due to unzooming in gui

2017-11-13 15:25:49 +01:00

src

merge conflict resolved from 3.0.1

2017-11-17 09:40:42 +01:00

.gitignore

.project added to gitignore

2017-10-12 15:07:33 +02:00

CMakeLists.txt

Merge branch 'developer' into zmqdata

2016-09-20 14:42:20 +02:00

doxy.config

actions without scan, positions, min plotimer=250,acquisition problem,error showing in actions tab

2012-07-27 10:01:35 +00:00

gitInfo.txt

updaterev

2017-09-20 19:00:09 +02:00

Makefile

should be able to compile in pcmoench as l_msdetect

2017-07-26 15:09:24 +02:00

slsDetectorGui.pro

some more changes to make file for automatic versioning, but changes to cpp file does not affect make, need to include that

2017-07-10 11:20:50 +02:00

updateGitVersion.sh

removed ui include files as they are generated anyway for every make

2017-07-26 11:12:56 +02:00