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

merge conflict sorted, removing rest

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-05 11:25:10 +01:00
parent 28211af5af 536203b6dc
commit 0ef52138e1
17 changed files with 34 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/doxy.config
View File

@ -143,7 +143,6 @@ INPUT = commonFiles/communication_funcs.h \
../slsReceiverSoftware/include/logger.h \
../slsReceiverSoftware/include/MySocketTCP.h \
../slsReceiverSoftware/include/receiver_defs.h \
../slsReceiverSoftware/include/RestHelper.h \
../slsReceiverSoftware/include/sls_receiver_defs.h \
../slsReceiverSoftware/include/sls_receiver_funcs.h \
../slsReceiverSoftware/include/slsReceiver.h \
@ -152,7 +151,6 @@ INPUT = commonFiles/communication_funcs.h \
../slsReceiverSoftware/include/ThreadObject.h \
../slsReceiverSoftware/include/UDPBaseImplementation.h \
../slsReceiverSoftware/include/UDPInterface.h \
../slsReceiverSoftware/include/UDPRESTImplementation.h \
../slsReceiverSoftware/include/UDPStandardImplementation.h \
../slsReceiverSoftware/include/utilities.h \
../slsReceiverSoftware/include/ZmqSocket.h