Skip to content
Snippets Groups Projects
Commit 4802541d authored by Roberto Raggi's avatar Roberto Raggi
Browse files

Merge branch 'master' of ../mainline into dui-editor 

Conflicts:
	src/plugins/texteditor/basetextdocument.cpp
parents 4b125189 ae24255a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 12882 additions and 893 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment