Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/plugins/debugger/gdb/gdbengine.cpp 14 additions, 1 deletionsrc/plugins/debugger/gdb/gdbengine.cpp
- src/plugins/debugger/gdb/trkclient.cpp 1 addition, 1 deletionsrc/plugins/debugger/gdb/trkclient.cpp
- src/plugins/debugger/watchhandler.cpp 1 addition, 1 deletionsrc/plugins/debugger/watchhandler.cpp
- src/plugins/debugger/watchutils.cpp 7 additions, 0 deletionssrc/plugins/debugger/watchutils.cpp
- src/plugins/debugger/watchutils.h 1 addition, 0 deletionssrc/plugins/debugger/watchutils.h
- src/plugins/qtscripteditor/parser/javascript.g 27 additions, 5 deletionssrc/plugins/qtscripteditor/parser/javascript.g
- src/plugins/qtscripteditor/parser/javascriptgrammar.cpp 0 additions, 13 deletionssrc/plugins/qtscripteditor/parser/javascriptgrammar.cpp
- src/plugins/qtscripteditor/parser/javascriptparser.cpp 27 additions, 5 deletionssrc/plugins/qtscripteditor/parser/javascriptparser.cpp
Loading
Please register or sign in to comment