detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

conflict gitversion

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-07-03 17:45:06 +02:00
parent 460a44a9b1
commit 14bba171e7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 93d7b6862d591a0615e8f6f710aca7c69040dd97 Repsitory UUID: 95d1843ad9c5f8e6b73d305d43d102c823d564f3
Revision: 601 Revision: 602
Branch: updaterec Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 606 Last Changed Rev: 607
Last Changed Date: 2017-07-03 13:45:45 +0200 Last Changed Date: 2017-07-03 17:37:31 +0200

6
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "93d7b6862d591a0615e8f6f710aca7c69040dd97" #define SVNREPUUID "95d1843ad9c5f8e6b73d305d43d102c823d564f3"
//#define SVNREV 0x606 //#define SVNREV 0x607
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x606 #define SVNREV 0x607
#define SVNDATE 0x20170703 #define SVNDATE 0x20170703
// //