• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.6' · d5d1c5e3
    Eike Ziller authored
    Conflicts:
    	src/libs/utils/fileutils.cpp
    	src/plugins/remotelinux/deployablefilesperprofile.cpp
    	src/plugins/remotelinux/genericdirectuploadservice.cpp
    	src/tools/qtcreatorcrashhandler/main.cpp
    
    Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
    d5d1c5e3
cppmodelmanager.cpp 42.8 KB