Merge remote-tracking branch 'origin/R4_2_maintenance'
Conflicts:
bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF
bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java
diff --git a/bundles/org.eclipse.core.databinding.property/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.databinding.property/META-INF/MANIFEST.MF
index e8d6964..b2124d5 100644
--- a/bundles/org.eclipse.core.databinding.property/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.databinding.property/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.core.databinding.property
-Bundle-Version: 1.4.100.qualifier
+Bundle-Version: 1.4.200.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.core.databinding.property/plugin.properties b/bundles/org.eclipse.core.databinding.property/plugin.properties
index 8d13557..d20991b 100644
--- a/bundles/org.eclipse.core.databinding.property/plugin.properties
+++ b/bundles/org.eclipse.core.databinding.property/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2012 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,5 +8,5 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-pluginName = JFace Data Binding
+pluginName = JFace Data Binding Properties
providerName = Eclipse.org
diff --git a/bundles/org.eclipse.core.databinding.property/pom.xml b/bundles/org.eclipse.core.databinding.property/pom.xml
index 8d01eae..703988b 100644
--- a/bundles/org.eclipse.core.databinding.property/pom.xml
+++ b/bundles/org.eclipse.core.databinding.property/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>eclipse.platform.ui</groupId>
<artifactId>org.eclipse.core.databinding.property</artifactId>
- <version>1.4.100-SNAPSHOT</version>
+ <version>1.4.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.jface.databinding/META-INF/MANIFEST.MF b/bundles/org.eclipse.jface.databinding/META-INF/MANIFEST.MF
index 47b97f9..57795d5 100644
--- a/bundles/org.eclipse.jface.databinding/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jface.databinding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jface.databinding
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.6.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -24,6 +24,5 @@
org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
org.eclipse.core.databinding;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.3
diff --git a/bundles/org.eclipse.jface.databinding/pom.xml b/bundles/org.eclipse.jface.databinding/pom.xml
index 0042880..44939c3 100644
--- a/bundles/org.eclipse.jface.databinding/pom.xml
+++ b/bundles/org.eclipse.jface.databinding/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>eclipse.platform.ui</groupId>
<artifactId>org.eclipse.jface.databinding</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.6.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/pom.xml b/pom.xml
index 7b9cb89..442644d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,9 +118,9 @@
<module>bundles/org.eclipse.ui.views.properties.tabbed</module>
<module>bundles/org.eclipse.ui.workbench</module>
<module>bundles/org.eclipse.ui.navigator</module>
- <module>bundles/org.eclipse.ui.tutorials.rcp.part1</module>
- <module>bundles/org.eclipse.ui.tutorials.rcp.part2</module>
- <module>bundles/org.eclipse.ui.tutorials.rcp.part3</module>
+ <module>examples/org.eclipse.ui.tutorials.rcp.part1</module>
+ <module>examples/org.eclipse.ui.tutorials.rcp.part2</module>
+ <module>examples/org.eclipse.ui.tutorials.rcp.part3</module>
<module>features/org.eclipse.e4.rcp</module>
<module>bundles/org.eclipse.ui.ide</module>
<module>bundles/org.eclipse.ui.ide.application</module>
