Skip to content

Commit

Permalink
Fixed broken merge from 1.5_maintenance
Browse files Browse the repository at this point in the history
- missed manifests and features
  • Loading branch information
creckord committed May 16, 2017
1 parent 1ca67c8 commit 8d0469a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.mpc"
label="%featureName"
version="1.5.4.qualifier"
version="1.6.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.epp.mpc.ui"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.help.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.help.ui;singleton:=true
Bundle-Version: 1.5.4.qualifier
Bundle-Version: 1.6.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.help;bundle-version="3.5.0"
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.equinox.p2.ui.discovery;bundle-version="[1.0.0,1.1.0)",
org.eclipse.equinox.p2.discovery;bundle-version="[1.0.0,1.1.0)",
org.eclipse.ui.intro;bundle-version="3.5.0";resolution:=optional,
org.eclipse.ui.intro.universal;bundle-version="3.5.0";resolution:=optional,
org.eclipse.ui.intro.universal;bundle-version="3.3.0";resolution:=optional,
org.eclipse.equinox.p2.repository;bundle-version="2.0.0",
org.eclipse.equinox.p2.core;bundle-version="1.0.4",
org.eclipse.equinox.p2.ui;bundle-version="1.0.4",
Expand Down

0 comments on commit 8d0469a

Please sign in to comment.