1. 08 Jan, 2014 2 commits
    • Eike Ziller's avatar
      Merge remote-tracking branch 'origin/3.0' · 236ea9ef
      Eike Ziller authored
      Conflicts:
      	share/qtcreator/debugger/dumper.cpp
      	share/qtcreator/debugger/dumper_p.h
      	share/qtcreator/debugger/test/main.cpp
      	src/plugins/debugger/gdb/classicgdbengine.cpp
      	src/plugins/debugger/gdb/pythongdbengine.cpp
      	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
      	src/plugins/debugger/lldblib/guest/lldbengineguest.h
      	src/plugins/debugger/lldblib/guest/main.cpp
      	src/plugins/debugger/lldblib/ipcengineguest.cpp
      	src/plugins/debugger/lldblib/ipcengineguest.h
      	src/plugins/debugger/lldblib/ipcenginehost.cpp
      	src/plugins/debugger/lldblib/ipcenginehost.h
      	src/plugins/debugger/lldblib/lldbenginehost.cpp
      	src/plugins/debugger/lldblib/lldboptionspage.cpp
      	src/plugins/qbsprojectmanager/qbsstep.cpp
      	src/plugins/qbsprojectmanager/qbsstep.h
      	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
      	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
      	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
      	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
      	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
      	src/plugins/qnx/blackberrycheckdevmodestep.cpp
      	src/plugins/qtsupport/debugginghelper.cpp
      
      Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
      236ea9ef
    • Robert Loehning's avatar
      Incremented year in copyright info · 746c5d88
      Robert Loehning authored
      Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
      Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
      Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
      746c5d88
  2. 07 Jan, 2014 29 commits
  3. 06 Jan, 2014 9 commits