Merge remote-tracking branch 'origin/5.1'

Authored by kossebau on Jan 23 2017, 11:20 PM.

Description

Merge remote-tracking branch 'origin/5.1'

Details

Merged Changes

CommitAuthorDetailsCommitted
5076902fbddakossebau
Merge remote-tracking branch 'origin/5.0' into 5.1 
Jan 23 2017
dc8f234ca9d8kossebau
Remove bogus definition of QLineEdit as customwidget from UI files 
Jan 23 2017
b1055d929bd7kossebau
Update ui files: KUrlRequester in KF5 extends QWidget, no more QFrame 
Jan 23 2017
38fa47e9860dD4219antonanikin
Fix bug 374921: Tool view grouping no longer works in 5.1 branch 
Jan 23 2017
faff287f0fbfD4192kossebau
File templates tool: with no open document, use base dir of project or home 
Jan 22 2017
97237d4e6dd2brauch
Update version number to 5.0.4 
Jan 18 2017
c86a5c3f0b0dkfunk
Cleanup: Remove unused member 
Jan 17 2017