mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 18:17:59 +02:00
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
Conflicts: multiSlsDetector/multiSlsDetector.cpp
This commit is contained in:
@ -1,11 +1,11 @@
|
||||
//#define SVNPATH ""
|
||||
#define SVNURLLIB "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git"
|
||||
//#define SVNREPPATH ""
|
||||
#define SVNREPUUIDLIB "c31619c88e5690230fcd389dc18f9139295c442c"
|
||||
//#define SVNREV 0x852
|
||||
#define SVNREPUUIDLIB "ce7cd6255b7b3abf1c046e9703ae8288ec55135a"
|
||||
//#define SVNREV 0x865
|
||||
//#define SVNKIND ""
|
||||
//#define SVNSCHED ""
|
||||
#define SVNAUTHLIB "Maliakal_Dhanya"
|
||||
#define SVNREVLIB 0x852
|
||||
#define SVNDATELIB 0x20140909
|
||||
#define SVNREVLIB 0x865
|
||||
#define SVNDATELIB 0x20141016
|
||||
//
|
||||
|
Reference in New Issue
Block a user