| commit | 10e94aa406470f3e046fa582d49accbf2f564d65 | [log] [tgz] |
|---|---|---|
| author | John Arthorne <John_Arthorne@ca.ibm.com> | Wed Feb 15 13:18:16 2012 -0500 |
| committer | John Arthorne <John_Arthorne@ca.ibm.com> | Wed Feb 15 13:18:16 2012 -0500 |
| tree | 28afe9a96d8fe6e114fa29d1fc48e4c29caa79a2 | |
| parent | cde6ed7cbe588363534edd79c6dc14773021a54b [diff] | |
| parent | 2cf53b05f82a8aa6d78412453a1c3560e80b75e2 [diff] |
Merge branch 'master' into R4_HEAD Conflicts: bundles/org.eclipse.jdt.doc.isv/topics_Guide.xml bundles/org.eclipse.jdt.doc.user/build.properties bundles/org.eclipse.jdt.doc.user/reference/ref-properties-source-attachment.htm bundles/org.eclipse.platform.doc.isv/platformOptions.txt