Diffusion KDevelop 255b49547e3f

Merge branch '5.1'
255b49547e3f
Actions

Authored by kossebau on Aug 1 2017, 3:39 AM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. formatters/customscript/customscript_plugin.cpp

Details

Committed
kossebauAug 1 2017, 3:39 AM
Parents
R32:bbbf1fdeca29: Restore preview for source formatting styles in config selection
R32:0743127d806f: Astyle formatting style settings: add colon after labels' text
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
bbbf1fdeca29kossebau
Restore preview for source formatting styles in config selection 
Aug 1 2017

Changes (2)

PathPackages
Mformatters/astyle/astyle_plugin.cpp
Mformatters/customscript/customscript_plugin.cpp

R32:255b49547e3f

View Options

formatters/astyle/astyle_plugin.cpp

Loading...
View Options

formatters/customscript/customscript_plugin.cpp

Loading...