Skip to content
Snippets Groups Projects
Commit 3177c853 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.7' 

Conflicts:
	src/plugins/clearcase/clearcaseplugin.cpp
	src/plugins/clearcase/clearcasesync.cpp

Change-Id: Ie696e82f28770f3288c19e2174979f838f2876ad
parents c222a4f6 629c1300
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment