changes for merges from 2.3 incl standard packet header

This commit is contained in:
Dhanya Maliakal
2017-03-20 11:22:07 +01:00
7 changed files with 45 additions and 34 deletions

View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 1b28feb21b0963439560b102ef572f070d77ed77
Revision: 272
Branch: hdf5
Repsitory UUID: f54cba156ce79a2b50445326a8ca4d1dc7d3cc5a
Revision: 273
Branch: 2.3-rc
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1345
Last Changed Date: 2017-03-03 09:05:40 +0100
Last Changed Rev: 1335
Last Changed Date: 2017-03-20 09:27:38 +0100

View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
//#define SVNREPPATH ""
#define SVNREPUUID "1b28feb21b0963439560b102ef572f070d77ed77"
//#define SVNREV 0x1345
#define SVNREPUUID "f54cba156ce79a2b50445326a8ca4d1dc7d3cc5a"
//#define SVNREV 0x1335
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1345
#define SVNDATE 0x20170303
#define SVNREV 0x1335
#define SVNDATE 0x20170320
//