Merge branch '2.1-rc' into developer

This commit is contained in:
Dhanya Maliakal
2016-09-22 17:19:10 +02:00
7 changed files with 23 additions and 20 deletions

View File

@@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH ""
#define SVNREPUUIDLIB "e9878a26ffb7e57c6e6724215e46ae5634871e64"
//#define SVNREV 0x1149
#define SVNREPUUIDLIB "372aa91aaff8c6acd0fb70a257774ac56974a4b1"
//#define SVNREV 0x1154
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1149
#define SVNDATELIB 0x20160824
#define SVNREVLIB 0x1154
#define SVNDATELIB 0x20160922
//