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

Merge remote-tracking branch 'origin/2.4' 

Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
parents 826354e3 a8a170a4
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 693 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