-
- Downloads
Merge remote-tracking branch 'origin/2.3'
Conflicts: qtcreator.pri Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
No related branches found
No related tags found
Showing
- share/qtcreator/translations/extract-externaltools.xq 6 additions, 0 deletionsshare/qtcreator/translations/extract-externaltools.xq
- share/qtcreator/translations/qtcreator_fr.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_fr.ts
- share/qtcreator/translations/qtcreator_ja.ts 8955 additions, 1563 deletionsshare/qtcreator/translations/qtcreator_ja.ts
- share/qtcreator/translations/qtcreator_ru.ts 8 additions, 8 deletionsshare/qtcreator/translations/qtcreator_ru.ts
- share/qtcreator/translations/qtcreator_zh_CN.ts 8251 additions, 1028 deletionsshare/qtcreator/translations/qtcreator_zh_CN.ts
- share/qtcreator/translations/translations.pro 6 additions, 1 deletionshare/qtcreator/translations/translations.pro
- src/libs/3rdparty/cplusplus/AST.cpp 1 addition, 1 deletionsrc/libs/3rdparty/cplusplus/AST.cpp
- src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp 2 additions, 0 deletionssrc/libs/qmljsdebugclient/qdeclarativedebugclient.cpp
- src/libs/utils/buildablehelperlibrary.cpp 2 additions, 2 deletionssrc/libs/utils/buildablehelperlibrary.cpp
- src/plugins/coreplugin/externaltool.cpp 3 additions, 1 deletionsrc/plugins/coreplugin/externaltool.cpp
- src/plugins/cppeditor/cpphighlighter.cpp 4 additions, 0 deletionssrc/plugins/cppeditor/cpphighlighter.cpp
- src/plugins/debugger/debuggerplugin.cpp 2 additions, 2 deletionssrc/plugins/debugger/debuggerplugin.cpp
- src/plugins/debugger/qml/qmlcppengine.cpp 5 additions, 1 deletionsrc/plugins/debugger/qml/qmlcppengine.cpp
- src/plugins/fakevim/fakevimhandler.cpp 0 additions, 1 deletionsrc/plugins/fakevim/fakevimhandler.cpp
- src/plugins/fakevim/fakevimplugin.cpp 4 additions, 4 deletionssrc/plugins/fakevim/fakevimplugin.cpp
- src/plugins/git/branchmodel.cpp 5 additions, 2 deletionssrc/plugins/git/branchmodel.cpp
- src/plugins/texteditor/basetextdocumentlayout.cpp 66 additions, 0 deletionssrc/plugins/texteditor/basetextdocumentlayout.cpp
- src/plugins/texteditor/basetextdocumentlayout.h 16 additions, 0 deletionssrc/plugins/texteditor/basetextdocumentlayout.h
- src/plugins/texteditor/syntaxhighlighter.cpp 10 additions, 0 deletionssrc/plugins/texteditor/syntaxhighlighter.cpp
- src/share/qtcreator/externaltools/lrelease.xml 0 additions, 3 deletionssrc/share/qtcreator/externaltools/lrelease.xml
Loading
Please register or sign in to comment