Skip to content
Find file Blame History Permalink
  • Oswald Buddenhagen's avatar
    Merge branch '2.3' into 2.4 · 0164e1be
    Oswald Buddenhagen authored 
    Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
    0164e1be