1. 09 Oct, 2012 11 commits
  2. 08 Oct, 2012 25 commits
  3. 05 Oct, 2012 4 commits
    • Eike Ziller's avatar
      Merge remote-tracking branch 'origin/2.6' · 6fd252b0
      Eike Ziller authored
      Conflicts:
      	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
      	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
      	src/plugins/debugger/qtmessageloghandler.cpp
      	src/plugins/debugger/qtmessageloghandler.h
      	src/plugins/debugger/qtmessagelogwindow.cpp
      	src/plugins/madde/maemodeployconfigurationwidget.cpp
      	src/plugins/madde/maemodeployconfigurationwidget.h
      	src/plugins/remotelinux/deployablefilesperprofile.cpp
      	src/plugins/remotelinux/deployablefilesperprofile.h
      	src/plugins/remotelinux/deploymentinfo.cpp
      	src/plugins/remotelinux/deploymentinfo.h
      	src/plugins/remotelinux/deploymentsettingsassistant.cpp
      	src/plugins/remotelinux/profilesupdatedialog.cpp
      	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
      	tests/auto/icheckbuild/ichecklib.cpp
      	tests/auto/icheckbuild/ichecklib_global.h
      	tests/auto/icheckbuild/parsemanager.cpp
      	tests/auto/icheckbuild/parsemanager.h
      	tests/manual/ssh/tunnel/tunnel.h
      
      Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
      6fd252b0
    • Eike Ziller's avatar
      Fix build · cfdac3c8
      Eike Ziller authored
      
      
      Change-Id: I9369dc8811bd2a4caab1de8910020e6cce563831
      Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
      cfdac3c8
    • Eike Ziller's avatar
      Merge origin/2.6 · 68c796e2
      Eike Ziller authored
      Conflicts:
      	src/libs/utils/fileutils.cpp
      	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
      	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
      	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
      	src/plugins/cmakeprojectmanager/cmakeproject.cpp
      	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
      	src/plugins/cmakeprojectmanager/makestep.cpp
      	src/plugins/qtsupport/baseqtversion.cpp
      
      Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
      68c796e2
    • Robert Loehning's avatar
      Fixed typo · 6c15f14b
      Robert Loehning authored
      
      
      Change-Id: Ia5930fbbaf5af4b5d92f64101fa0a8e6f1d4d15f
      Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
      6c15f14b