Skip to content
Snippets Groups Projects
Commit be3fafc3 authored by con's avatar con
Browse files

Merge commit '2be0845c' 

Conflicts:
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
parents c1413ffa 2be0845c
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 5159 additions and 3429 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