detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 08:17:13 +02:00
Code Issues Actions Packages Releases Activity

updated for compilation

Browse Source
This commit is contained in:
maliakal_d
2018-03-14 16:19:30 +01:00
parent b58c3e8951
commit dd6301d66d
8 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,14 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
<<<<<<< HEAD
#define GITREPUUID "92b4b3324e09299663b9862bad26b38a3257dd60"
#define GITAUTH "Andrä_Marie"
#define GITREV 0x3570
#define GITDATE 0x20180119
#define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3727
#define GITDATE 0x20180314
#define GITBRANCH "developer"
=======
#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105"
#define GITAUTH "Erik_Frojdh"
#define GITREV 0x3458
#define GITDATE 0x20180312
#define GITBRANCH "3.1.0-rc"
>>>>>>> 3.1.0