Merge branch '5.1'

Authored by kossebau on Feb 16 2017, 6:35 AM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. plugins/filetemplates/templateoptionspage.cpp

Merged Changes

CommitAuthorDetailsCommitted
8ec0ea56560cD4413kossebau
Template file dialog: kill old widgets on re-entering TemplateOptionsPage 
Feb 16 2017