diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2013-10-03 17:39:03 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-10-03 17:39:33 +0200 |
| commit | fdc80f7cad0979e65e669e8564a67a1fedbc5705 (patch) | |
| tree | 09d44cfdba0527aa4df395a8e9ec68644496b677 /org.eclipse.jgit.ui | |
| parent | 0be59ab033a66d63389cf8bd1145af0763a70a5b (diff) | |
| parent | da6e87bc373c54c1cda8ed563f41f65df52bacbf (diff) | |
| download | jgit-fdc80f7cad0979e65e669e8564a67a1fedbc5705.tar.gz jgit-fdc80f7cad0979e65e669e8564a67a1fedbc5705.zip | |
Merge branch 'stable-3.1'
* stable-3.1:
Prepare post 3.1.0 builds
JGit v3.1.0.201310021548-r
Fix order of commits in rebase todo file header
Prepare post 3.1.0 RC1 builds
JGit v3.1.0.201309270735-rc1
Attempt to fix graph layout when new heads are introduced
Prepare re-signing pgm's ueberjar to avoid SecurityException
Use full branch name when getting ref in BranchTrackingStatus
Change-Id: Ida30175d0c058048cbe4b563aae7f85cd008db29
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.ui')
| -rw-r--r-- | org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 | ||||
| -rw-r--r-- | org.eclipse.jgit.ui/pom.xml | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index bb72a3189c..d4b1fa7c86 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jgit.awtui;version="3.1.0" -Import-Package: org.eclipse.jgit.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.nls;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)" +Export-Package: org.eclipse.jgit.awtui;version="3.1.1" +Import-Package: org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.nls;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5d3b79af60..cc5d4fd269 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> |