Dhanya Thattil 70a1b87603 merge conflict resolved

2018-10-30 14:31:20 +01:00

..

include

merge conflict resolved

2018-10-30 14:31:20 +01:00

src

merge conflict resolved

2018-10-30 14:31:20 +01:00

.gitignore

.project added to gitignore

2017-10-12 15:08:12 +02:00

CMakeLists.txt

combined all the funcs into one, servers need to be recompiled

2018-10-11 13:57:47 +02:00

gitInfo.txt

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

2018-10-11 12:25:18 +02:00

Makefile

combined all the funcs into one, servers need to be recompiled

2018-10-11 13:57:47 +02:00

slsReceiverUsers.doxy

receiver compiles

2018-10-09 18:02:47 +02:00

updateAPIVersion.sh

slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up

2018-05-28 19:11:34 +02:00

updateGitVersion.sh

solved errors with client compile, rxr yet to do

2018-10-09 13:43:50 +02:00