| commit | 5b3d4b64cc9ad7ecffe36f8f380ad0a34e2287dd | [log] [tgz] |
|---|---|---|
| author | Paul Webster <pwebster@ca.ibm.com> | Mon Oct 15 08:16:43 2012 -0400 |
| committer | Paul Webster <pwebster@ca.ibm.com> | Mon Oct 15 08:16:43 2012 -0400 |
| tree | 54a15733d41f659cff6c498f25bf3a991f206f0d | |
| parent | e1c0c66db094da378369de5e6f71eb31cd0cf127 [diff] | |
| parent | 72b00818d30034882b730a777cdea708a24fda6d [diff] |
Merge in the fixes and bump up o.e.ui and o.e.ui.workbench to a new version number. Merge remote branch 'origin/R4_2_maintenance' Conflicts: bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF