From d3c4d52118f5eb3ae7c5439f2c6420092e5f4c3e Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 29 Sep 2016 10:29:48 +0200 Subject: [PATCH] updaterev --- slsDetectorSoftware/eigerDetectorServer/gitInfo.txt | 6 +++--- slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h | 4 ++-- slsDetectorSoftware/gitInfo.txt | 10 +++++----- slsDetectorSoftware/slsDetector/gitInfoLib.h | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index cd9d988a3..26ed16c52 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: d0ef24c35c9b677a297a0ebf7f19a0196df424b5 -Revision: 237 +Repsitory UUID: c829da8894d7532ecedd7f41099f93de60d9ab00 +Revision: 240 Branch: developer Last Changed Author: Dhanya_Maliakal Last Changed Rev: 22 -Last Changed Date: 2016-09-26 12:00:23 +0200 +Last Changed Date: 2016-09-29 10:28:37 +0200 diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 530c99b36..1c72c9b8e 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer" //#define SVNREPPATH "" -#define SVNREPUUID "d0ef24c35c9b677a297a0ebf7f19a0196df424b5" +#define SVNREPUUID "c829da8894d7532ecedd7f41099f93de60d9ab00" //#define SVNREV 0x22 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" #define SVNREV 0x22 -#define SVNDATE 0x20160926 +#define SVNDATE 0x20160929 // diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 6e76b64a9..e966f94db 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: 372aa91aaff8c6acd0fb70a257774ac56974a4b1 -Revision: 1154 -Branch: 2.1-rc +Repsitory UUID: c829da8894d7532ecedd7f41099f93de60d9ab00 +Revision: 1167 +Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1154 -Last Changed Date: 2016-09-22 17:16:49 +0200 +Last Changed Rev: 1167 +Last Changed Date: 2016-09-29 10:28:37 +0200 diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index fbcb75f9e..cfa84c3ff 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 SVNREPPATH "" -#define SVNREPUUIDLIB "d0ef24c35c9b677a297a0ebf7f19a0196df424b5" -//#define SVNREV 0x1164 +#define SVNREPUUIDLIB "c829da8894d7532ecedd7f41099f93de60d9ab00" +//#define SVNREV 0x1167 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x1164 -#define SVNDATELIB 0x20160926 +#define SVNREVLIB 0x1167 +#define SVNDATELIB 0x20160929 //