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

merge insignificant conflicts

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-10 11:19:36 +02:00
parent 0219d09067 df11f41416
commit 11943c4b5c
5 changed files with 133 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsReceiverSoftware/include/UDPRESTImplementation.h
View File

@ -8,6 +8,7 @@
#include "UDPBaseImplementation.h"
#include "RestHelper.h"
#include "logger.h"
#include <string.h>
#include <stdio.h>

2
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,5 +1,5 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
#define SVNURL "https://git.psi.ch/sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "abdbd15341f292983b3943639c54404c700fbdb8"
//#define SVNREV 0x627