From 0eaecc0e12114ad13dc059c3354642345270a1fb Mon Sep 17 00:00:00 2001 From: Maliakal Dhanya Date: Tue, 3 Jun 2014 13:56:39 +0200 Subject: [PATCH] git version history --- slsDetectorGui/gitInfo.txt | 8 ++++---- slsDetectorGui/include/gitInfoGui.h | 8 ++++---- slsDetectorGui/slsDetectorGui.pro | 2 +- slsDetectorGui/src/qDetectorMain.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 0762de198..129a7e955 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git -Repsitory UUID: bf99e3b9300675c33067e0934fd271b841d5dd66 -Revision: 271 +Repsitory UUID: 8d8e3f9221be0f85c016a7d48e5d1abed5fdcc95 +Revision: 272 Branch: separate_receiver Last Changed Author: Maliakal_Dhanya -Last Changed Rev: 271 -Last Changed Date: 2014-05-23 14:52:12 +0200 +Last Changed Rev: 272 +Last Changed Date: 2014-06-03 12:07:35 +0200 diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index e6d8f76e0..ae315cd41 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "bf99e3b9300675c33067e0934fd271b841d5dd66" -//#define SVNREV 0x271 +#define SVNREPUUID "8d8e3f9221be0f85c016a7d48e5d1abed5fdcc95" +//#define SVNREV 0x272 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Maliakal_Dhanya" -#define SVNREV 0x271 -#define SVNDATE 0x20140523 +#define SVNREV 0x272 +#define SVNDATE 0x20140603 // diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro index ac60c2004..da52c63f8 100644 --- a/slsDetectorGui/slsDetectorGui.pro +++ b/slsDetectorGui/slsDetectorGui.pro @@ -126,7 +126,7 @@ HEADERS = \ include/qTabDebugging.h\ include/qTabDeveloper.h\ include/qTabMessages.h\ - include/svnInfoGui.h\ + include/gitInfoGui.h\ ../slsDetectorSoftware/commonFiles/sls_detector_defs.h\ include/qServer.h diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index fcd191340..bfb4df3d6 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -17,7 +17,7 @@ #include "slsDetector.h" #include "multiSlsDetector.h" #include "sls_detector_defs.h" -#include "svnInfoGui.h" +#include "gitInfoGui.h" // Qt Include Headers #include #include