From 2fc98c7a5475a7d259e8e3d08707eb7c75c788f6 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 18 Jul 2018 15:04:47 +0200 Subject: [PATCH] updated binaries, eiger jungfrau --- ...v3.3.0.0 => eigerDetectorServer_developer} | Bin 302050 -> 302050 bytes .../eigerDetectorServer/gitInfo.txt | 10 +++++----- .../eigerDetectorServer/gitInfoEiger.h | 8 ++++---- ...3.0.0 => jungfrauDetectorServer_developer} | Bin 116268 -> 116268 bytes .../jungfrauDetectorServer/gitInfo.txt | 10 +++++----- .../jungfrauDetectorServer/gitInfoJungfrau.h | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) rename slsDetectorSoftware/eigerDetectorServer/bin/{eigerDetectorServerv3.3.0.0 => eigerDetectorServer_developer} (99%) rename slsDetectorSoftware/jungfrauDetectorServer/bin/{jungfrauDetectorServerv3.3.0.0 => jungfrauDetectorServer_developer} (99%) 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 17cdfa199c5ff67f79c702f7509595a3a9aa5a70..e0c29547ddb9481f36ee759098a895f617bbe338 100755 GIT binary patch delta 28 jcmaE~UFgwvp$*T!Fp4+7_|pF33nLISZGZ8F`PVW4_9hWn delta 28 jcmaE~UFgwvp$*T!FbXuk_|pF33nLISZGZ8F`PVW4^{5e1 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 7c32a48190f9f52d40544b4692fcf66e01b929e4..954b478a112e91bd1c44047660682fe729d26e37 100755 GIT binary patch delta 32 ocmZ3}!@j16eS#*lzm>pr#Ue(DjV{wV8O57#cW%Gk$rxw@0J`f7(*OVf delta 32 ocmZ3}!@j16eS#*l%R27qibaeP8(pS#G72=`?%aO6lQGZ+0K+#7FaQ7m 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"