diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index b954ebb83..30313225e 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: 2874d09e1ddd257e87cbcf7f4d8bb6e7ef69d99f -Revision: 1445 -Branch: cmakefix +Repsitory UUID: cf21b6d9cf4da3c251942505fee950639971aaa1 +Revision: 1447 +Branch: 3.0-rc Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1450 -Last Changed Date: 2017-07-27 11:01:49.000000002 +0200 ./threadFiles/ThreadPool.o +Last Changed Rev: 1452 +Last Changed Date: 2017-07-28 10:59:15.000000002 +0200 ./slsDetector/slsDetectorUtils.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 1542fb654..e8bf34dcf 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 "2874d09e1ddd257e87cbcf7f4d8bb6e7ef69d99f" -//#define SVNREV 0x1450 +#define SVNREPUUIDLIB "cf21b6d9cf4da3c251942505fee950639971aaa1" +//#define SVNREV 0x1452 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x1450 -#define SVNDATELIB 0x20170727 +#define SVNREVLIB 0x1452 +#define SVNDATELIB 0x20170728 //