Merge branch '5.1'
- Conflicts:
- plugins/welcomepage/qml/Develop.qml
kossebau | Aug 2 2017, 1:18 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
a95884b6df1c | kossebau | welcome page: fix icon for "Openn Project", use same as for menu action | Aug 2 2017 | |||
4839050078a2 | D7057 | kossebau | Filetemplate generation: avoid trailing empty line in license header | Aug 2 2017 | ||
96dbea1aa35f | D6838 | kossebau | Fix duplicated annotation context menus & entries on repeated border show | Aug 1 2017 |