Merge remote branch 'origin/2.0' (3922be1b) · 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

3922be1b

Commit 3922be1b authored 15 years ago by con

Downloads
- Plain Diff

Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp

parents 17fd33bd 626221b6

No related branches found

No related tags found

Loading

Changes 84

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/texteditor/texteditoractionhandler.h 18 additions, 0 deletions

src/plugins/texteditor/texteditoractionhandler.h
src/plugins/texteditor/texteditorconstants.h 16 additions, 0 deletions

src/plugins/texteditor/texteditorconstants.h
src/plugins/welcome/welcomemode.ui 1 addition, 1 deletion

src/plugins/welcome/welcomemode.ui
tests/auto/qml/qmldesigner/coretests/coretests.pro 2 additions, 2 deletions

tests/auto/qml/qmldesigner/coretests/coretests.pro

with 37 additions and 3 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