Merge branch '2.3-rc' into hdf5

This commit is contained in:
Dhanya Maliakal 2017-03-03 09:06:49 +01:00
commit 80fb0a99a8
2 changed files with 9 additions and 9 deletions

View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 2f78f4e118bfba443f84a3f72b2839610a8858a3
Revision: 493
Branch: developer
Repsitory UUID: 398e8b241fe37a2102709553b8b0fa3650f97966
Revision: 499
Branch: 2.3-rc
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 493
Last Changed Date: 2016-11-30 10:36:46 +0100
Last Changed Rev: 499
Last Changed Date: 2016-12-15 14:32:34 +0100

View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "2f78f4e118bfba443f84a3f72b2839610a8858a3"
//#define SVNREV 0x493
#define SVNREPUUID "398e8b241fe37a2102709553b8b0fa3650f97966"
//#define SVNREV 0x499
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x493
#define SVNDATE 0x20161130
#define SVNREV 0x499
#define SVNDATE 0x20161215
//