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

merge developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-07-03 17:42:06 +02:00
parent f944d7cae4 b4309a9f60
commit 374b07a126
6 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,20 @@
//#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH ""
<<<<<<< HEAD
#define SVNREPUUIDLIB "f296ac9eb68e7681675cad9943f5054eb7f8bdce"
//#define SVNREV 0x1438
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1438
=======
#define SVNREPUUIDLIB "788060fd5a954e42fea270b25b8a398293013e96"
//#define SVNREV 0x1437
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1437
>>>>>>> developer
#define SVNDATELIB 0x20170703
//