Dhanya Thattil 6be47d936f conflicts resolved

2019-02-14 17:32:33 +01:00

..

client

CMakeLists.txt: reordering and removing those we dont use anymore, removed all the Makefiles (except the ones for the detector servers)

2019-02-14 16:15:43 +01:00

forms

gui: bug fix advanced tab (network and trimming) was a mess

2018-09-25 18:00:21 +02: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

updated version

2018-09-27 18:23:08 +02:00

slsDetectorPlotting

replace lostFocus with editingFinished for QT

2018-05-18 17:05:35 +02:00

src

fix in ltc, added moench, separated servers, left to do max1932, client side for moench and more detailed in ctb server side

2018-12-19 16:38:18 +01:00

.gitignore

.project added to gitignore

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

CMakeLists.txt

fixed linking zmq

2019-02-13 15:35:40 +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

updated version

2018-09-27 18:23:08 +02:00

slsDetectorGui.pro

refactor receiver client interface, moved defs into one sls_detector_defs.h

2018-10-11 12:25:18 +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