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

Merge branch '2.3' into 2.4 

Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
parents aa95055e dd324e06
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 30380 additions and 7737 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