Merge branch 'master' into multicursor

Authored by brauch on Dec 24 2017, 9:44 PM.

Description

Merge branch 'master' into multicursor

  1. Conflicts:
  2. src/document/katedocument.cpp

Details

Committed
brauchDec 24 2017, 9:44 PM
Parents
R39:0f2335f3edc0: Fix compilation
R39:5deca9c7bed6: Merge branch 'master' into multicursor
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
0f2335f3edc0D7660safaalfulaij
Fix compilation 
Dec 24 2017
c9b412d40334D7660safaalfulaij
Fix a regression caused by changing backspace key behavior 
Dec 23 2017
5abb34a1fc6fcullmann
port to non-deprecated API like already used at other place 
Dec 20 2017
d00275c443e5kfunk
Add missing include for std::array 
Dec 19 2017
fc7433321d36D9393dhaumann
MessageInterface: Add CenterInView as additional position 
Dec 18 2017
2e0e36414569l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Dec 16 2017