You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hdt.apache.org by ad...@apache.org on 2013/03/08 20:41:10 UTC
[3/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-hdt
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
Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/dde51151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/dde51151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/dde51151
Branch: refs/heads/master
Commit: dde5115134fcd0f55a6a95b09cb35dc9a656227e
Parents: d02ff68 fa78301
Author: adamb <ad...@apache.org>
Authored: Fri Mar 8 13:29:50 2013 -0600
Committer: adamb <ad...@apache.org>
Committed: Fri Mar 8 13:29:50 2013 -0600
----------------------------------------------------------------------
org.apache.hdt.help/.classpath | 7 -------
org.apache.hdt.help/src/.gitignore | 2 ++
org.apache.hdt.ui/.classpath | 7 -------
3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/dde51151/org.apache.hdt.help/.classpath
----------------------------------------------------------------------
diff --cc org.apache.hdt.help/.classpath
index 0b1bcf9,bc74aab..0000000
deleted file mode 100644,100644
--- a/org.apache.hdt.help/.classpath
+++ /dev/null
@@@ -1,7 -1,6 +1,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>
- <classpathentry kind="output" path="bin"/>
-</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/dde51151/org.apache.hdt.ui/.classpath
----------------------------------------------------------------------
diff --cc org.apache.hdt.ui/.classpath
index 0b1bcf9,8a8f166..0000000
deleted file mode 100644,100644
--- a/org.apache.hdt.ui/.classpath
+++ /dev/null
@@@ -1,7 -1,7 +1,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>
-<?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="bin"/>
-</classpath>