| commit | 08eef7fc562968530312ced2d25b4937718b5451 | [log] [tgz] |
|---|---|---|
| author | Thomas Watson <tjwatson@us.ibm.com> | Tue Nov 15 10:47:10 2011 -0600 |
| committer | Thomas Watson <tjwatson@us.ibm.com> | Tue Nov 15 10:47:10 2011 -0600 |
| tree | b1543101af383da75aa7592ea4ba481c384fa46c | |
| parent | 6299155b2708b26f4b36084d7c67a9cdca977e86 [diff] | |
| parent | 5a42c6ea2f82c3769228b69b3b1e4d706e0f0f4e [diff] |
Merge branch 'R3_6_maintenance' into R3_6_maintenance_Java7 Conflicts: bundles/org.eclipse.osgi.tests/.gitignore bundles/org.eclipse.osgi/.gitignore