From 8b1d0aed40b4fc3ed5b30aa824a4c2924b788454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 11:11:20 -0400
Subject: [PATCH] Merge branch 'ticket/142' into develop

---
 gitblit.iml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gitblit.iml b/gitblit.iml
index f8a8a67..878fdc3 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -47,24 +47,24 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="guava-16.0.1.jar">
+      <library name="guava-17.0.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/guava-16.0.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/guava-17.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/guava-16.0.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/guava-17.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="guice-servlet-4.0-beta4.jar">
+      <library name="guice-servlet-4.0-gb1.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-beta4.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-beta4.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

--
Gitblit v1.9.1