Merge branch '3.0.1' into developer

This commit is contained in:
Dhanya Maliakal
2017-12-06 08:44:21 +01:00
6 changed files with 35 additions and 36 deletions

View File

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