Merge branch 'master' into multicursor
- Conflicts:
- src/document/katedocument.cpp
brauch | Dec 24 2017, 9:44 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
0f2335f3edc0 | D7660 | safaalfulaij | Fix compilation | Dec 24 2017 | ||
c9b412d40334 | D7660 | safaalfulaij | Fix a regression caused by changing backspace key behavior | Dec 23 2017 | ||
5abb34a1fc6f | cullmann | port to non-deprecated API like already used at other place | Dec 20 2017 | |||
d00275c443e5 | kfunk | Add missing include for std::array | Dec 19 2017 | |||
fc7433321d36 | D9393 | dhaumann | MessageInterface: Add CenterInView as additional position | Dec 18 2017 | ||
2e0e36414569 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Dec 16 2017 |