This commit was manufactured by cvs2svn to create tag 'PTP_1_1_1'.
Sprout from ptp_1_1 2007-09-07 02:12:45 UTC Greg Watson <g.watson@computer.org> 'Fix some minor build problems'
Cherrypick from ptp_1_1 2007-08-30 02:38:19 UTC Beth Tibbitts <tibbitts@us.ibm.com> 'fix dependencies so it recognizes the correct (and incorrect) versions of eclipse and CDT':
core/org.eclipse.ptp.doc.user/html/00overview.html
releng/org.eclipse.ptp.pldt-feature/feature.xmldiff --git a/core/org.eclipse.ptp.doc.user/html/00overview.html b/core/org.eclipse.ptp.doc.user/html/00overview.html
index 6bd9cc9..d8e2071 100755
--- a/core/org.eclipse.ptp.doc.user/html/00overview.html
+++ b/core/org.eclipse.ptp.doc.user/html/00overview.html
@@ -1,28 +1,27 @@
-<html>
-<head>
-<title>PTP - Overview and Features</title>
-</head>
-<body>
-<h1 id="top">PTP - Overview and Features</h1>
-<!-- test -->
-<p><p>The Parallel Tools Platform (PTP) objectives include:
-<ul>
-<li>Extending Eclipse to support parallel application development.
-Not just for MPI, but for other environments and APIs as well.
-<li>Equipping Eclipse with key tools needed to start developing
-parallel codes. This includes the Parallel runtime, parallel debugger,
-Fortran, etc.
-<li>Encouraging parallel tool developers to support Eclipse
-<li>Developing a new generation of parallel tools needed to
-meet the demands of HPCS.
-</ul>
-<h2 id="arch">PTP Architecture</h2>
-<img src="images/ptpArch.gif">
-
-
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-
-</html>
+<html>
+<head>
+<title>PTP - Overview and Features</title>
+</head>
+<body>
+<h1 id="top">PTP - Overview and Features</h1>
+<p><p>The Parallel Tools Platform (PTP) objectives include:
+<ul>
+<li>Extending Eclipse to support parallel application development.
+Not just for MPI, but for other environments and APIs as well.
+<li>Equipping Eclipse with key tools needed to start developing
+parallel codes. This includes the Parallel runtime, parallel debugger,
+Fortran, etc.
+<li>Encouraging parallel tool developers to support Eclipse
+<li>Developing a new generation of parallel tools needed to
+meet the demands of HPCS.
+</ul>
+<h2 id="arch">PTP Architecture</h2>
+<img src="images/ptpArch.gif">
+
+
+
+<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
+
+</body>
+
+</html>
diff --git a/releng/org.eclipse.ptp.pldt-feature/feature.xml b/releng/org.eclipse.ptp.pldt-feature/feature.xml
index 7a19e6a..1708772 100644
--- a/releng/org.eclipse.ptp.pldt-feature/feature.xml
+++ b/releng/org.eclipse.ptp.pldt-feature/feature.xml
@@ -22,9 +22,9 @@
</url>
<requires>
- <import plugin="org.eclipse.core.resources" />
+ <import plugin="org.eclipse.core.resources" version="3.2.2" match="compatible"/>
<import plugin="org.eclipse.team.core"/>
- <import plugin="org.eclipse.core.runtime" version="3.2" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.2" match="equivalent"/>
<import plugin="org.eclipse.text"/>
<import plugin="org.eclipse.debug.core"/>
<import plugin="org.eclipse.ui" version="3.2" match="compatible"/>
@@ -38,7 +38,7 @@
<import plugin="org.eclipse.core.variables"/>
<import plugin="org.eclipse.ui.views"/>
<import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.compare"/>
+ <import plugin="org.eclipse.compare" />
<import plugin="org.eclipse.ui.console"/>
<import plugin="org.eclipse.core.filebuffers"/>
<import plugin="org.eclipse.help"/>
