Skip to content
Commit 5d45fec2 authored by Dominik Haumann's avatar Dominik Haumann
Browse files

Merge branch 'master' into multicursor 

Resolved conflicts:
- src/document/katedocument.cpp
- src/undo/kateundomanager.cpp
- src/undo/kateundomanager.h
- src/view/kateview.cpp
parents 7010c9c2 58b96201
Hide whitespace changes
Inline Side-by-side
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