Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-10-02 15:25:17 +0000
committerThomas Watson2012-10-02 15:25:17 +0000
commit4f277ed781bfb41298899656078984f65238012d (patch)
tree1bc9b923794cfa5449fa73871ee7820b8fe0aabb /bundles/org.eclipse.osgi.compatibility.state/.project
parent7b63388cf0c3235797d74468c7c0d92560864e99 (diff)
parentafd5f96ac81c0cc17918da755c85b32ce4fabded (diff)
downloadrt.equinox.framework-4f277ed781bfb41298899656078984f65238012d.tar.gz
rt.equinox.framework-4f277ed781bfb41298899656078984f65238012d.tar.xz
rt.equinox.framework-4f277ed781bfb41298899656078984f65238012d.zip
Merge branch 'master' into twatson/container
Conflicts: bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.core.prefs bundles/org.eclipse.osgi/META-INF/MANIFEST.MF bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/InternalSystemBundle.java bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java
Diffstat (limited to 'bundles/org.eclipse.osgi.compatibility.state/.project')
0 files changed, 0 insertions, 0 deletions

Back to the top