Merge branch '2.0' (adf2c1b0) · Commits · Marco Bubke / flatpak-qt-creator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

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

Snippets Groups Projects

adf2c1b0

Commit adf2c1b0 authored 14 years ago by Friedemann Kleint

Downloads
- Plain Diff

Merge branch '2.0'

Conflicts:
	src/plugins/qmlinspector/QmlInspector.pluginspec

parents 3ed60eaa a9cf11c5

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

doc/qt-defines.qdocconf 1 addition, 0 deletions

doc/qt-defines.qdocconf
doc/qtcreator.qdoc 5 additions, 3 deletions

doc/qtcreator.qdoc
src/plugins/coreplugin/progressmanager/progressmanager_win.cpp 1 addition, 1 deletion

...lugins/coreplugin/progressmanager/progressmanager_win.cpp
src/plugins/debugger/cdb/breakpoint.cpp 4 additions, 4 deletions

src/plugins/debugger/cdb/breakpoint.cpp
src/plugins/debugger/cdb/coreengine.cpp 3 additions, 3 deletions

src/plugins/debugger/cdb/coreengine.cpp
src/plugins/help/helpplugin.cpp 60 additions, 9 deletions

src/plugins/help/helpplugin.cpp
src/plugins/help/helpplugin.h 5 additions, 0 deletions

src/plugins/help/helpplugin.h
src/plugins/qmlinspector/QmlInspector.pluginspec 1 addition, 1 deletion

src/plugins/qmlinspector/QmlInspector.pluginspec

with 80 additions and 21 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