Fix merge failure for Eclipse project files.


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6368 8db76d5a-ed1c-0410-87a9-c151d255dfc7

eclipse/dev/.checkstyle

diff --git a/eclipse/dev/linux/.checkstyle b/eclipse/dev/.checkstyle
similarity index 100%
rename from eclipse/dev/linux/.checkstyle
rename to eclipse/dev/.checkstyle

eclipse/dev/.classpath

diff --git a/eclipse/dev/linux/.classpath b/eclipse/dev/.classpath
similarity index 84%
rename from eclipse/dev/linux/.classpath
rename to eclipse/dev/.classpath
index 88ad728..5e1f3db 100644
--- a/eclipse/dev/linux/.classpath
+++ b/eclipse/dev/.classpath
@@ -2,10 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="core/src"/>
 	<classpathentry kind="src" path="core/test"/>
-	<classpathentry kind="src" path="linux/src"/>
+	<classpathentry kind="src" path="oophm/overlay"/>
+	<classpathentry kind="src" path="oophm/src"/>
+	<classpathentry kind="src" path="oophm/test"/>
 	<classpathentry excluding="com/google/gwt/dev/jjs/intrinsic/" kind="src" path="core/super"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/org.eclipse.swt.gtk-linux-3.2.1.jar" sourcepath="/GWT_TOOLS/lib/eclipse/org.eclipse.swt.gtk-linux-3.2.1.src.zip"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/apache/ant-1.6.5.jar" sourcepath="/GWT_TOOLS/lib/apache/ant-1.6.5-src.zip"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2.jar" sourcepath="/GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2-src.zip"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdt-3.4.2.jar" sourcepath="/GWT_TOOLS/lib/eclipse/jdt-3.4.2-src.zip"/>
@@ -35,8 +36,11 @@
 	<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/servlets-default-1.0.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/servlets-invoker-1.0.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-coyote-1.0.jar"/>
-	<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-http11-1.0.jar"/>
+	<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-http11-1.0.jar" sourcepath="/GWT_TOOLS/lib/tomcat/tomcat-http11-1.0.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-jk2-2.1.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-util-5.1.jar"/>
+	<classpathentry kind="var" path="GWT_TOOLS/lib/sun/swingworker/swing-worker-1.1.jar"/>
+	<classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070-sources.jar"/>
+	<classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5070-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

eclipse/dev/.project

diff --git a/eclipse/dev/.project b/eclipse/dev/.project
new file mode 100644
index 0000000..b1ad44e
--- /dev/null
+++ b/eclipse/dev/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>gwt-dev</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>core</name>
+			<type>2</type>
+			<locationURI>GWT_ROOT/dev/core</locationURI>
+		</link>
+		<link>
+			<name>oophm</name>
+			<type>2</type>
+			<locationURI>GWT_ROOT/dev/oophm</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>

eclipse/dev/linux/.project

diff --git a/eclipse/dev/linux/.project b/eclipse/dev/linux/.project
deleted file mode 100644
index 4f73f6e..0000000
--- a/eclipse/dev/linux/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>gwt-dev-linux</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>linux</name>
-			<type>2</type>
-			<location>GWT_ROOT/dev/linux</location>
-		</link>
-		<link>
-			<name>core</name>
-			<type>2</type>
-			<location>GWT_ROOT/dev/core</location>
-		</link>
-	</linkedResources>
-</projectDescription>