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

Merge remote-tracking branch 'origin/2.8' into 3.0 

Conflicts:
	src/plugins/projectexplorer/editorconfiguration.cpp

Change-Id: Iff7eccd9386c1f5d870e40f1e033dfef2cb0bf87
parents 8ba52466 3584ce89
No related branches found
No related tags found
No related merge requests 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