From b673617734d3d2370c314d3b36412a3e7ded5a4c Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael.hierweck@hostsharing.net>
Date: Wed, 31 Oct 2012 14:23:53 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hsarweb/.classpath |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hsarweb/.classpath b/hsarweb/.classpath
index 30d5f00..d6cc4ef 100644
--- a/hsarweb/.classpath
+++ b/hsarweb/.classpath
@@ -2,9 +2,12 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="lib/commons-cli-1.2.jar"/>
-	<classpathentry kind="lib" path="lib/xmlrpc-client-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/xmlrpc-common-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/ws-commons-util-1.0.1.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/cas-client-core-3.1.10.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/ws-commons-util-1.0.2.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlrpc-client-3.1.3.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlrpc-common-3.1.3.jar"/>
+	<classpathentry kind="lib" path="/hsarback/lib/servlet-api-2.4.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/vaadin-6.8.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

--
Gitblit v1.9.1