Merge branch '5.1'

Authored by kossebau on Feb 25 2017, 5:13 PM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. plugins/externalscript/editexternalscript.ui

Merged Changes

CommitAuthorDetailsCommitted
99785eaf7c41kossebau
External script edit dialog: stick dialog buttons to bottom, fix tab order 
Feb 25 2017