| commit | 374f8d8e7d9de7be624a9e2a4019afbae337eef4 | [log] [tgz] |
|---|---|---|
| author | Paul Webster <pwebster@ca.ibm.com> | Thu Jul 07 11:06:10 2011 -0400 |
| committer | Paul Webster <pwebster@ca.ibm.com> | Thu Jul 07 11:06:10 2011 -0400 |
| tree | 97eadcbd9db135fcaa14e1fa2f43b74742726820 | |
| parent | ce73153dd77c780c7aefd0e522bed8be4f7e1d8e [diff] | |
| parent | 15b07dffbc496516cbd46c8f58ba6a6dca606040 [diff] |
Merge branch 'R4_HEAD' Preparing 'master' for 4.2 work Conflicts: bundles/org.eclipse.ui/META-INF/MANIFEST.MF bundles/org.eclipse.ui/schema/viewActions.exsd