Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

Conflicts:
	multiSlsDetector/multiSlsDetector.cpp
This commit is contained in:
2014-11-25 11:46:34 +01:00
29 changed files with 350 additions and 160 deletions

View File

@ -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
//