From 7436d6c8d3538cef443e0fa76bc01762fd6cc246 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 6 Dec 2017 08:44:07 +0100 Subject: [PATCH] updaterev --- slsDetectorGui/gitInfo.txt | 12 ++++++------ slsDetectorGui/include/gitInfoGui.h | 10 +++++----- slsDetectorSoftware/gitInfo.txt | 14 +++++++------- slsDetectorSoftware/slsDetector/gitInfoLib.h | 10 +++++----- slsReceiverSoftware/gitInfo.txt | 15 +++++++-------- slsReceiverSoftware/include/gitInfoReceiver.h | 10 +++++----- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 4e14c07b2..1216c199d 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui -URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git -Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git -Repsitory UUID: 065ca6f25866959822ece4b6d6649bf3fe759071 -Revision: 417 +URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git +Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git +Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 +Revision: 437 Branch: 3.0.1 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 417 -Last Changed Date: 2017-09-15 13:27:18.000000002 +0200 ./src/qTabAdvanced.cpp +Last Changed Rev: 3185 +Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 49820bd0f..54ccfae48 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" +#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" //#define SVNREPPATH "" -#define SVNREPUUID "065ca6f25866959822ece4b6d6649bf3fe759071" -//#define SVNREV 0x417 +#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8" +//#define SVNREV 0x3185 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x417 -#define SVNDATE 0x20170915 +#define SVNREV 0x3185 +#define SVNDATE 0x20171206 // diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 0040aef5b..2b9da45f6 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware -URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: ea284699983c3811852b1bcea3708d952803020d -Revision: 1611 -Branch: zmqchange +URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git +Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git +Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 +Revision: 1627 +Branch: 3.0.1 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1619 -Last Changed Date: 2017-11-27 14:45:39.000000002 +0100 ./slsDetector/slsDetectorBase.h +Last Changed Rev: 3185 +Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./slsDetector/slsDetectorUtils.h diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 634e08943..9b4f4d7cf 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" +#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" //#define SVNREPPATH "" -#define SVNREPUUIDLIB "ea284699983c3811852b1bcea3708d952803020d" -//#define SVNREV 0x1619 +#define SVNREPUUIDLIB "b498043ea612fa3148bf1d7ea2a39c46092addf8" +//#define SVNREV 0x3185 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x1619 -#define SVNDATELIB 0x20171127 +#define SVNREVLIB 0x3185 +#define SVNDATELIB 0x20171206 // diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 8df80919d..808e1feba 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,10 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware -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 -Repsitory UUID: 820bd8c6a08b5ac05dc6e28e6cfd5674f07d57f7 -Revision: 658 -Branch: hotfix2 +URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git +Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git +Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 +Revision: 687 +Branch: 3.0.1 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 663 -Last Changed Date: 2017-10-18 15:51:33.000000002 +0200 ./src/UDPStandardImplementation.cpp - +Last Changed Rev: 3185 +Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/UDPStandardImplementation.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 0f9304146..54ccfae48 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" +#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" //#define SVNREPPATH "" -#define SVNREPUUID "820bd8c6a08b5ac05dc6e28e6cfd5674f07d57f7" -//#define SVNREV 0x663 +#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8" +//#define SVNREV 0x3185 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x663 -#define SVNDATE 0x20171018 +#define SVNREV 0x3185 +#define SVNDATE 0x20171206 //