| commit | c2abdb1b103a2bd311a68fbbd8535764a07bfe45 | [log] [tgz] |
|---|---|---|
| author | Paul Webster <pwebster@ca.ibm.com> | Tue Aug 28 15:35:21 2012 -0400 |
| committer | Paul Webster <pwebster@ca.ibm.com> | Tue Aug 28 15:35:21 2012 -0400 |
| tree | 30acf879ac42ecb77df18974dc8a2c11036e3b94 | |
| parent | be0240b2d44b51398b6dcb2bfef2d3e5b8fb6f6e [diff] | |
| parent | 1a04fade85bb3b4fc994edb51dbaca48ad24cb3a [diff] |
Merge remote branch 'origin/R4_2_maintenance' Changes from 4.2.1 into master, excluding the revert of bug 144610 Conflicts: bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties