4e8c9b778279b2b3333371e3f51e893ceaac728a - platform/eclipse.platform.team

commit: 4e8c9b778279b2b3333371e3f51e893ceaac728a

[log]
author: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>

Tue Aug 14 15:29:20 2018 +0530
committer: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>

Tue Aug 14 16:07:28 2018 +0530
tree: 3ac5ffd22fd3a99460f796cb9da66c60bc129139
parent: 72ceb2761335e3587de3617eb5a6759cce2cc668 [diff]
parent: 06b1f593759c48fa39345a475c089d200145c8cf [diff]

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

tree: 3ac5ffd22fd3a99460f796cb9da66c60bc129139

bundles/
examples/
features/
tests/
.gitignore
CONTRIBUTING.md
pom.xml