Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-hdt
Conflicts:
org.apache.hdt.help/.classpath
org.apache.hdt.ui/.classpath
diff --git a/org.apache.hdt.help/.classpath b/org.apache.hdt.help/.classpath
deleted file mode 100644
index 0b1bcf9..0000000
--- a/org.apache.hdt.help/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.apache.hdt.help/src/.gitignore b/org.apache.hdt.help/src/.gitignore
new file mode 100644
index 0000000..7830ad7
--- /dev/null
+++ b/org.apache.hdt.help/src/.gitignore
@@ -0,0 +1,2 @@
+# This whole directory is presently ignored, except by Eclipse's Export Feature command, which wants it to exist.
+# This file is so git will check in the directory.
diff --git a/org.apache.hdt.ui/.classpath b/org.apache.hdt.ui/.classpath
deleted file mode 100644
index 0b1bcf9..0000000
--- a/org.apache.hdt.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
