Merge branch '3.2' of git+ssh://github.com/getrailo/railo into 3.2

Conflicts: railo-java/railo-loader/.classpath
getrailo · Mar 25, 2011 · 07313e6 · 07313e6
2 parents 88e0207 + 9e50a98
commit 07313e6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/railo-java/railo-loader/.classpath b/railo-java/railo-loader/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/1.5.0"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/Railo-Libs/antlr.jar"/>
 	<classpathentry kind="lib" path="/Railo-Libs/apache-jakarta-commons-codec.jar"/>
 	<classpathentry kind="lib" path="/Railo-Libs/apache-jakarta-commons-collections.jar"/>