Skip to content
Find file Blame History Permalink
  • Eike Ziller's avatar
    Merge remote-tracking branch 'origin/3.2' · 914adeab
    Eike Ziller authored 
    Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
    914adeab