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

Merge remote-tracking branch 'origin/3.2'

Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
parents b2487e16 6bf9a192
No related branches found
No related tags found
No related merge requests found
Showing
with 312 additions and 198 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment