Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Jun 1 2016, 9:55 AM.

Description

Merge remote-tracking branch 'origin/5.0'

Details

Merged Changes

CommitAuthorDetailsCommitted
2c1878c1a5d8apol
Remove unused Qt5Script dependency 
May 27 2016
18ac02556ddbD932mwolff
Add merge capability for git plugin. 
May 24 2016
94437e90c43fapol
remove some duplicated code 
May 24 2016
46162566e510qi437103/kfunk
Fix Bug 333759 Variables tool view not in sync with frame stack view. 
May 24 2016
def467960c75broulik/kfunk
Show job progress in Task Manager 
May 24 2016