Merge branch '5.1'

Authored by kossebau on Aug 2 2017, 1:18 PM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. plugins/welcomepage/qml/Develop.qml

Merged Changes

CommitAuthorDetailsCommitted
a95884b6df1ckossebau
welcome page: fix icon for "Openn Project", use same as for menu action 
Aug 2 2017
4839050078a2D7057kossebau
Filetemplate generation: avoid trailing empty line in license header 
Aug 2 2017
96dbea1aa35fD6838kossebau
Fix duplicated annotation context menus & entries on repeated border show 
Aug 1 2017