Skip to content
Snippets Groups Projects
Commit f013c41d authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/3.1' 

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
parents 187bb369 0afa004c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 493 additions and 31 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