commit 507465662d924e2e7a239cf0d91987182abbfd71
author Paul Webster <pwebster@ca.ibm.com> Mon Sep 17 13:18:12 2012 -0400
committer Paul Webster <pwebster@ca.ibm.com> Mon Sep 17 13:18:12 2012 -0400
tree 54a15733d41f659cff6c498f25bf3a991f206f0d
parent 2035680576003ab313b392841d693fb6f665d998
parent 72b00818d30034882b730a777cdea708a24fda6d

Merge remote branch 'origin/R4_2_maintenance'

.gitignore

diff --git a/.gitignore b/.gitignore
index b22cae3..46a3d17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /*/*/bin/
+/*/*/target
 *~
 *.rej
 *.bak

bundles/org.eclipse.core.databinding/pom.xml

diff --git a/bundles/org.eclipse.core.databinding/pom.xml b/bundles/org.eclipse.core.databinding/pom.xml
index b184fdc..f6e4d74 100644
--- a/bundles/org.eclipse.core.databinding/pom.xml
+++ b/bundles/org.eclipse.core.databinding/pom.xml
@@ -11,7 +11,7 @@
 -->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.ui</artifactId>

pom.xml

diff --git a/pom.xml b/pom.xml
index 5bb98c0..e12e23c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../eclipse-parent</relativePath>
   </parent>
 
   <groupId>eclipse.platform.ui</groupId>