Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1
Showing
- bin/qtcreator 1 addition, 1 deletionbin/qtcreator
- src/libs/extensionsystem/pluginspec.cpp 2 additions, 1 deletionsrc/libs/extensionsystem/pluginspec.cpp
- src/libs/utils/process_stub.pro 2 additions, 0 deletionssrc/libs/utils/process_stub.pro
- src/plugins/debugger/debuggermanager.cpp 1 addition, 1 deletionsrc/plugins/debugger/debuggermanager.cpp
- src/plugins/debugger/gdbengine.cpp 9 additions, 9 deletionssrc/plugins/debugger/gdbengine.cpp
- src/plugins/debugger/scriptengine.cpp 19 additions, 11 deletionssrc/plugins/debugger/scriptengine.cpp
- src/plugins/debugger/scriptengine.h 1 addition, 0 deletionssrc/plugins/debugger/scriptengine.h
- src/plugins/debugger/watchhandler.cpp 8 additions, 0 deletionssrc/plugins/debugger/watchhandler.cpp
- src/plugins/debugger/watchhandler.h 1 addition, 0 deletionssrc/plugins/debugger/watchhandler.h
- src/plugins/debugger/watchwindow.cpp 8 additions, 4 deletionssrc/plugins/debugger/watchwindow.cpp
- src/plugins/qt4projectmanager/qtversionmanager.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qtversionmanager.cpp
- src/plugins/qtscripteditor/parser/javascriptengine_p.cpp 42 additions, 13 deletionssrc/plugins/qtscripteditor/parser/javascriptengine_p.cpp
- src/plugins/qtscripteditor/parser/javascriptengine_p.h 68 additions, 39 deletionssrc/plugins/qtscripteditor/parser/javascriptengine_p.h
- tests/manual/gdbdebugger/script/math.js 2 additions, 1 deletiontests/manual/gdbdebugger/script/math.js
- tests/manual/gdbdebugger/simple/app.cpp 6 additions, 0 deletionstests/manual/gdbdebugger/simple/app.cpp
Loading
Please register or sign in to comment