| commit | e5011f98cb5b5665aa399edede2b2cd949f97b06 | [log] [tgz] |
|---|---|---|
| author | Paul Webster <pwebster@ca.ibm.com> | Thu Jan 24 10:02:17 2013 -0500 |
| committer | Paul Webster <pwebster@ca.ibm.com> | Thu Jan 24 10:02:17 2013 -0500 |
| tree | c241357ae0cfabc11f493ab11631c419ac029784 | |
| parent | cfdcc74b6f280106c07da89682777d16f9241deb [diff] | |
| parent | 3e69c0124987df1518c6af3ba7605ac6b3774ccb [diff] |
Merge remote branch 'origin/R4_2_maintenance' I took master for the conflicts listed below: Conflicts: bundles/org.eclipse.core.commands/META-INF/MANIFEST.MF bundles/org.eclipse.core.commands/pom.xml bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.bindings/pom.xml bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.css.swt.theme/pom.xml bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.css.swt/pom.xml bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.services/pom.xml bundles/org.eclipse.e4.ui.widgets/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.widgets/pom.xml bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/pom.xml bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.workbench.swt/pom.xml bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF bundles/org.eclipse.e4.ui.workbench/pom.xml bundles/org.eclipse.jface/META-INF/MANIFEST.MF bundles/org.eclipse.jface/pom.xml bundles/org.eclipse.ui.browser/META-INF/MANIFEST.MF bundles/org.eclipse.ui.browser/pom.xml bundles/org.eclipse.ui.win32/META-INF/MANIFEST.MF bundles/org.eclipse.ui.win32/pom.xml bundles/org.eclipse.ui.workbench.compatibility/META-INF/MANIFEST.MF bundles/org.eclipse.ui.workbench.compatibility/pom.xml
Platform UI provides the basic building blocks for user interfaces built with Eclipse. Some of these form the Eclipse Rich Client Platform (RCP) and can be used for arbitrary rich client applications, while others are specific to the Eclipse IDE. The Platform UI codebase is built on top of the Eclipse Standard Widget Toolkit (SWT), which is developed as an independent project.
For more information, refer to the [Platform UI wiki page] 1.