Merge branch '5.1'
- Conflicts:
- plugins/filetemplates/templateoptionspage.cpp
kossebau | Feb 16 2017, 6:35 AM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
8ec0ea56560c | D4413 | kossebau | Template file dialog: kill old widgets on re-entering TemplateOptionsPage | Feb 16 2017 |