• 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
Name
Last commit
Last update
..
checkInstalledFiles.py Loading commit data...
createSourcePackages.sh Loading commit data...
dependencyinfo.py Loading commit data...
deployqt.py Loading commit data...
deployqtHelper_mac.sh Loading commit data...
fixCopyright.sh Loading commit data...
fix_makefile_header_dependencies.sh Loading commit data...
gcc2tasks.pl Loading commit data...
hasCopyright.pl Loading commit data...
krazy2tasks.pl Loading commit data...
makedmg.sh Loading commit data...
msvc2tasks.pl Loading commit data...
mytasks.pl Loading commit data...
packageIfw.py Loading commit data...
purify2tasks.pl Loading commit data...
qdoc2tasks.pl Loading commit data...
test2tasks.pl Loading commit data...
unixdeployqt.sh Loading commit data...