diff options
| author | Kalyan Prasad Tatavarthi | 2018-08-14 09:59:20 +0000 |
|---|---|---|
| committer | Kalyan Prasad Tatavarthi | 2018-08-14 10:37:28 +0000 |
| commit | 4e8c9b778279b2b3333371e3f51e893ceaac728a (patch) | |
| tree | 3ac5ffd22fd3a99460f796cb9da66c60bc129139 | |
| parent | 72ceb2761335e3587de3617eb5a6759cce2cc668 (diff) | |
| parent | 06b1f593759c48fa39345a475c089d200145c8cf (diff) | |
| download | eclipse.platform.team-4e8c9b778279b2b3333371e3f51e893ceaac728a.tar.gz eclipse.platform.team-4e8c9b778279b2b3333371e3f51e893ceaac728a.tar.xz eclipse.platform.team-4e8c9b778279b2b3333371e3f51e893ceaac728a.zip | |
Merge branch 'R4_7_maintenance' into change/125383/1
Conflicts:
bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java
Change-Id: Ie83e924f4cc201d409e9e5f486e08f915a464638
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/pom.xml | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/pom.xml | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF index a8b508aec..f46c2a9ed 100644 --- a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.cvs.core; singleton:=true -Bundle-Version: 3.4.100.qualifier +Bundle-Version: 3.4.101.qualifier Bundle-Activator: org.eclipse.team.internal.ccvs.core.CVSProviderPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.team.cvs.core/pom.xml b/bundles/org.eclipse.team.cvs.core/pom.xml index 926188f2d..ea298eabf 100644 --- a/bundles/org.eclipse.team.cvs.core/pom.xml +++ b/bundles/org.eclipse.team.cvs.core/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012, 2016 Eclipse Foundation and others. + Copyright (c) 2012, 2018 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.cvs.core</artifactId> - <version>3.4.100-SNAPSHOT</version> + <version>3.4.101-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF index 9be6f1db6..fdcf6918d 100644 --- a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true -Bundle-Version: 3.4.1.qualifier +Bundle-Version: 3.4.2.qualifier Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.team.cvs.ui/pom.xml b/bundles/org.eclipse.team.cvs.ui/pom.xml index 6853d6b07..848a535b9 100644 --- a/bundles/org.eclipse.team.cvs.ui/pom.xml +++ b/bundles/org.eclipse.team.cvs.ui/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012, 2015 Eclipse Foundation and others. + Copyright (c) 2012, 2018 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.cvs.ui</artifactId> - <version>3.4.1-SNAPSHOT</version> + <version>3.4.2-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |