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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-09-21 13:35:16 +02:00
commit c5ff578d10
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 253d74aaf3dfa161c067b00907c52001815f5bfe Repsitory UUID: 27301393e82602889700db12ab68a0c67a6f9736
Revision: 655 Revision: 657
Branch: 3.0 Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 660 Last Changed Rev: 662
Last Changed Date: 2017-09-01 13:56:44.000000002 +0200 ./include/ZmqSocket.h Last Changed Date: 2017-09-20 16:20:57.000000002 +0200 ./src/UDPStandardImplementation.cpp

8
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "253d74aaf3dfa161c067b00907c52001815f5bfe" #define SVNREPUUID "27301393e82602889700db12ab68a0c67a6f9736"
//#define SVNREV 0x660 //#define SVNREV 0x662
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x660 #define SVNREV 0x662
#define SVNDATE 0x20170901 #define SVNDATE 0x20170920
// //