detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-09-21 13:35:16 +02:00
commit 2bd5386c29
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repsitory UUID: ffc2947322d6abb36c7c9268899d4568c5e2d05a Repsitory UUID: 065ca6f25866959822ece4b6d6649bf3fe759071
Revision: 414 Revision: 417
Branch: 3.0-rc Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 414 Last Changed Rev: 417
Last Changed Date: 2017-08-04 18:47:03.000000002 +0200 ./src/qTabMessages.cpp Last Changed Date: 2017-09-15 13:27:18.000000002 +0200 ./src/qTabAdvanced.cpp

8
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "ffc2947322d6abb36c7c9268899d4568c5e2d05a" #define SVNREPUUID "065ca6f25866959822ece4b6d6649bf3fe759071"
//#define SVNREV 0x414 //#define SVNREV 0x417
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x414 #define SVNREV 0x417
#define SVNDATE 0x20170804 #define SVNDATE 0x20170915
// //