diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index b09cfef5c..cf5def048 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git -Repsitory UUID: 77af4677a040fe113b5115475c18fd27f2453def -Revision: 5 +Repsitory UUID: 1c259aeba8b068b9f6e550d63a9a3a14bd7d3ab7 +Revision: 6 Branch: master Last Changed Author: Maliakal_Dhanya -Last Changed Rev: 5 -Last Changed Date: 2014-05-28 18:06:00 +0200 +Last Changed Rev: 6 +Last Changed Date: 2014-06-03 12:06:57 +0200 diff --git a/slsReceiverSoftware/includes/gitInfoReceiver.h b/slsReceiverSoftware/includes/gitInfoReceiver.h index 641a0bdef..05f3c2ab6 100644 --- a/slsReceiverSoftware/includes/gitInfoReceiver.h +++ b/slsReceiverSoftware/includes/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "77af4677a040fe113b5115475c18fd27f2453def" -//#define SVNREV 0x5 +#define SVNREPUUID "1c259aeba8b068b9f6e550d63a9a3a14bd7d3ab7" +//#define SVNREV 0x6 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Maliakal_Dhanya" -#define SVNREV 0x5 -#define SVNDATE 0x20140528 +#define SVNREV 0x6 +#define SVNDATE 0x20140603 // diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp index 74c12dbca..ebb3d954d 100644 --- a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp @@ -5,7 +5,7 @@ #include "slsReceiverTCPIPInterface.h" #include "slsReceiverUDPFunctions.h" -#include "svnInfoReceiver.h" +#include "gitInfoReceiver.h" #include "slsReceiverUsers.h" #include //SIGINT