Dhanya Thattil 895f8ccf81 Merge branch '3.0.1' into developer

2018-02-08 14:51:20 +01:00

..

client

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

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

forms

makng the zmq work without external flag

2017-11-27 17:06:11 +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

solved conflicts from merge of version being used to binary

2017-12-06 19:07:06 +01:00

slsDetectorPlotting

fixed the double plot due to unzooming in gui

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

src

merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file

2018-02-07 11:02:36 +01:00

.gitignore

.project added to gitignore

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

CMakeLists.txt

gui install

2018-01-24 10:17:24 +01: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

possible to use binary --version or -v to get the branch and versionid

2017-12-06 19:05:35 +01: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

possible to use binary --version or -v to get the branch and versionid

2017-12-06 19:05:35 +01:00