Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-08-04 15:24:23 +0000
committerIgor Fedorenko2011-08-04 15:24:23 +0000
commit093352787bc8b48dfebd094d2967760491550e3e (patch)
treeb850877905e0c25f594a43ef8bdcdfcb395a4b7d /org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
parentc47e215285d7c562d2e8c98c52a80349abe070b6 (diff)
parent55bb6dd084da70138e6fd4800a514ee94abdb743 (diff)
downloadm2e-core-093352787bc8b48dfebd094d2967760491550e3e.tar.gz
m2e-core-093352787bc8b48dfebd094d2967760491550e3e.tar.xz
m2e-core-093352787bc8b48dfebd094d2967760491550e3e.zip
Merge remote-tracking branch 'origin/master' into m2e-self-hosting
Conflicts: com.ning.async-http-client/pom.xml org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF org.eclipse.m2e.archetype.common/pom.xml org.eclipse.m2e.core.ui/pom.xml org.eclipse.m2e.core/pom.xml org.eclipse.m2e.discovery/pom.xml org.eclipse.m2e.editor.xml/pom.xml org.eclipse.m2e.editor/pom.xml org.eclipse.m2e.feature/pom.xml org.eclipse.m2e.integration.tests.common/pom.xml org.eclipse.m2e.jdt/pom.xml org.eclipse.m2e.launching/pom.xml org.eclipse.m2e.lifecyclemapping.defaults/pom.xml org.eclipse.m2e.logback.appender/pom.xml org.eclipse.m2e.logback.configuration/pom.xml org.eclipse.m2e.logback.feature/pom.xml org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF org.eclipse.m2e.maven.indexer/pom.xml org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF org.eclipse.m2e.maven.runtime/pom.xml org.eclipse.m2e.model.edit/pom.xml org.eclipse.m2e.refactoring/pom.xml org.eclipse.m2e.scm/pom.xml org.eclipse.m2e.sdk.feature/pom.xml org.eclipse.m2e.site/pom.xml org.eclipse.m2e.tests.common/pom.xml org.eclipse.m2e.usagedata/pom.xml org.jboss.netty/pom.xml pom.xml target-platform/pom.xml
Diffstat (limited to 'org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF')
-rw-r--r--org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
index f495f88f..62f87124 100644
--- a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.m2e.logback.configuration;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Activator: org.eclipse.m2e.logback.configuration.LogPlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
ch.qos.logback.classic;bundle-version="0.9.24",

Back to the top