diff options
| author | Matthias Sohn | 2014-12-24 00:25:52 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2014-12-24 00:25:52 +0000 |
| commit | cf5219d6279ddae73da76c267a0b3310659702a2 (patch) | |
| tree | 76e661a333f81b6b1cf0385c24624b53bddb98ac /org.eclipse.egit-feature | |
| parent | aff73c5d3343ba469a554a3103c724ac09cf9b8c (diff) | |
| parent | ae7e707c18dfd733cfd80bacafb882248bb0cc1b (diff) | |
| download | egit-cf5219d6279ddae73da76c267a0b3310659702a2.tar.gz egit-cf5219d6279ddae73da76c267a0b3310659702a2.tar.xz egit-cf5219d6279ddae73da76c267a0b3310659702a2.zip | |
Merge branch 'stable-3.6'
* stable-3.6:
Prepare 3.6.1-SNAPSHOT builds
EGit v3.6.0.201412230720-r
Update documentation for 3.6.0
Always use EGitCredentialsProvider in EGit
Change-Id: Ia6a669d02fadb8c3409fcafcea9324cac8dfd41a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit-feature')
| -rw-r--r-- | org.eclipse.egit-feature/feature.xml | 4 | ||||
| -rw-r--r-- | org.eclipse.egit-feature/pom.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 8c915aca6a..6207e81329 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit" label="%featureName" - version="3.6.0.qualifier" + version="3.6.1.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> @@ -38,7 +38,7 @@ <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="compatible"/> <import plugin="org.eclipse.jsch.core" version="1.1.100" match="compatible"/> <import plugin="com.jcraft.jsch" version="0.1.37" match="compatible"/> - <import feature="org.eclipse.jgit" version="3.6.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="3.6.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index badd54cbe5..3e5ee1d4f1 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>3.6.0-SNAPSHOT</version> + <version>3.6.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> |