From d76568d6d93c3f89ac875beabf373a4020047281 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Thu, 28 Jun 2018 08:55:14 +0200
Subject: [PATCH] jungfrau server, merge fix binaries

---
 .../bin/jungfrauDetectorServer_developer      | Bin 116212 -> 116212 bytes
 .../jungfrauDetectorServer/gitInfo.txt        |   8 ++++----
 .../jungfrauDetectorServer/gitInfoJungfrau.h  |   6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index 87d433a9ca3dc73a6708cd3394ce4af901a9b6a7..a9ebd4cb1992085d81da8523ee5069895d5bd088 100755
GIT binary patch
delta 32
ocmey;&HkmEeS#*lNt^0)#v(?EjV@80j2g}JJGam8WDK<d0LkVH=l}o!

delta 32
ocmey;&HkmEeS#*l_)F*Mj75wR8(pG085x`BcW$5G$rx$_0MNY*B>(^b

diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
index 259d5bcdb..1b2f6fd1e 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: bab7d8e3fba7119b3da122cd4769f2447d6da28a 
-Revision: 154 
+Repsitory UUID: 72f47b2375be2f3b095e5bd35cebda523d2210ae 
+Revision: 156 
 Branch: developer 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3890 
-Last Changed Date: 2018-06-01 10:38:17.000000002 +0200 ./RegisterDefs.h
+Last Changed Rev: 3917 
+Last Changed Date: 2018-06-28 08:21:09.000000002 +0200 ./RegisterDefs.h
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
index 96684456e..759c800ca 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 "bab7d8e3fba7119b3da122cd4769f2447d6da28a"
+#define GITREPUUID "72f47b2375be2f3b095e5bd35cebda523d2210ae"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3890
-#define GITDATE 0x20180601
+#define GITREV 0x3917
+#define GITDATE 0x20180628
 #define GITBRANCH "developer"