diff options
| author | Thomas Watson | 2011-11-15 16:47:10 +0000 |
|---|---|---|
| committer | Thomas Watson | 2011-11-15 16:47:10 +0000 |
| commit | 08eef7fc562968530312ced2d25b4937718b5451 (patch) | |
| tree | b1543101af383da75aa7592ea4ba481c384fa46c /bundles/org.eclipse.osgi/.gitignore | |
| parent | 6299155b2708b26f4b36084d7c67a9cdca977e86 (diff) | |
| parent | 5a42c6ea2f82c3769228b69b3b1e4d706e0f0f4e (diff) | |
| download | rt.equinox.framework-08eef7fc562968530312ced2d25b4937718b5451.tar.gz rt.equinox.framework-08eef7fc562968530312ced2d25b4937718b5451.tar.xz rt.equinox.framework-08eef7fc562968530312ced2d25b4937718b5451.zip | |
Merge branch 'R3_6_maintenance' into R3_6_maintenance_Java7R36x_v20111115-1500
Conflicts:
bundles/org.eclipse.osgi.tests/.gitignore
bundles/org.eclipse.osgi/.gitignore
Diffstat (limited to 'bundles/org.eclipse.osgi/.gitignore')
| -rw-r--r-- | bundles/org.eclipse.osgi/.gitignore | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi/.gitignore b/bundles/org.eclipse.osgi/.gitignore index 10b5cec9d..324eb6720 100644 --- a/bundles/org.eclipse.osgi/.gitignore +++ b/bundles/org.eclipse.osgi/.gitignore @@ -5,7 +5,4 @@ console.jar core.jar defaultAdaptor.jar eclipseAdaptor.jar -resolver.jar -/generated/ -.DS_Store - +resolver.jar
\ No newline at end of file |