Merge remote branch 'origin/2.0' (a186982d) · Commits · Tobias Hunger / qt-creator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qt-creator
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

a186982d

Commit a186982d authored 14 years ago by con

Downloads
- Plain Diff

Merge remote branch 'origin/2.0'

Conflicts:
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdocconf

parents 08f522d9 5e3eb47e

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

share/qtcreator/translations/qtcreator_pl.ts 3343 additions, 1272 deletions

share/qtcreator/translations/qtcreator_pl.ts
src/plugins/coreplugin/dialogs/newdialog.cpp 3 additions, 3 deletions

src/plugins/coreplugin/dialogs/newdialog.cpp
src/plugins/coreplugin/dialogs/newdialog.ui 56 additions, 45 deletions

src/plugins/coreplugin/dialogs/newdialog.ui
src/plugins/coreplugin/generalsettings.cpp 1 addition, 1 deletion

src/plugins/coreplugin/generalsettings.cpp
src/plugins/git/branchmodel.cpp 7 additions, 4 deletions

src/plugins/git/branchmodel.cpp
src/plugins/perforce/settingspage.cpp 1 addition, 0 deletions

src/plugins/perforce/settingspage.cpp
src/plugins/projectexplorer/allprojectsfind.cpp 2 additions, 1 deletion

src/plugins/projectexplorer/allprojectsfind.cpp
src/plugins/projectexplorer/currentprojectfind.cpp 2 additions, 1 deletion

src/plugins/projectexplorer/currentprojectfind.cpp
src/plugins/texteditor/basefilefind.cpp 2 additions, 2 deletions

src/plugins/texteditor/basefilefind.cpp

with 3417 additions and 1329 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment