Merge remote-tracking branch 'origin/5.1'

Authored by kfunk on Feb 16 2017, 8:59 AM.

Description

Merge remote-tracking branch 'origin/5.1'

Details

Committed
kfunkFeb 16 2017, 8:59 AM
Parents
R32:1bfb1f981509: uncrustify: Sync config from kdevelop.git
R32:4e15563e5ac8: Merge branch '5.1'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
1bfb1f981509kfunk
uncrustify: Sync config from kdevelop.git 
Feb 16 2017
1f1ecf29e5c4kfunk
Update uncrustify config to adapt to KDev style 
Feb 16 2017
d5f9ba562067D4615antonanikin/kfunk
Increase default width of launch configuration dialog 
Feb 16 2017