diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.3.0.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer similarity index 99% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.3.0.0 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer index 17cdfa199..e0c29547d 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.3.0.0 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index 7e55d1c51..7c61c54a3 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: c2b1eef75cb3c8a83adc091c656d9d23ad331139 -Revision: 342 -Branch: 3.3.0-rc +Repsitory UUID: 3b6ead77836f2b6d2a795a9a994259d1dc8c131d +Revision: 343 +Branch: developer Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3939 -Last Changed Date: 2018-07-10 13:27:59.000000002 +0200 ./Makefile.virtual +Last Changed Rev: 3943 +Last Changed Date: 2018-07-17 16:15:43.000000002 +0200 ./Makefile.virtual diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 118cc5026..baa181354 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "c2b1eef75cb3c8a83adc091c656d9d23ad331139" +#define GITREPUUID "3b6ead77836f2b6d2a795a9a994259d1dc8c131d" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3939 -#define GITDATE 0x20180710 -#define GITBRANCH "3.3.0-rc" +#define GITREV 0x3943 +#define GITDATE 0x20180717 +#define GITBRANCH "developer" diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.3.0.0 b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer similarity index 99% rename from slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.3.0.0 rename to slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 7c32a4819..954b478a1 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.3.0.0 and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index dbb15888c..6db843d23 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: c2b1eef75cb3c8a83adc091c656d9d23ad331139 -Revision: 158 -Branch: 3.3.0-rc +Repsitory UUID: 3b6ead77836f2b6d2a795a9a994259d1dc8c131d +Revision: 159 +Branch: developer Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3939 -Last Changed Date: 2018-07-10 13:27:59.000000002 +0200 ./RegisterDefs.h +Last Changed Rev: 3943 +Last Changed Date: 2018-07-17 16:15:43.000000002 +0200 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index 118cc5026..baa181354 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "c2b1eef75cb3c8a83adc091c656d9d23ad331139" +#define GITREPUUID "3b6ead77836f2b6d2a795a9a994259d1dc8c131d" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3939 -#define GITDATE 0x20180710 -#define GITBRANCH "3.3.0-rc" +#define GITREV 0x3943 +#define GITDATE 0x20180717 +#define GITBRANCH "developer"