detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

Browse Source 
Conflicts:
	multiSlsDetector/multiSlsDetector.cpp
This commit is contained in:
bergamaschi
2014-11-25 11:46:34 +01:00
parent d10335e4a9 ceb2d28281
commit 91344f54d9
29 changed files with 350 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/jungfrauDetectorServer/sls_receiver_defs.h
View File

@ -1 +1 @@
../../slsReceiverSoftware/includes/sls_receiver_defs.h
../../slsReceiverSoftware/include/sls_receiver_defs.h

2
slsDetectorSoftware/jungfrauDetectorServer/sls_receiver_funcs.h
View File

@ -1 +1 @@
../../slsReceiverSoftware/includes/sls_receiver_funcs.h
../../slsReceiverSoftware/include/sls_receiver_funcs.h