diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /.clang-format | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.clang-format b/.clang-format index be3546fc49d..f48449cf33c 100644 --- a/.clang-format +++ b/.clang-format @@ -132,9 +132,7 @@ PenaltyBreakAssignment: 100 AllowShortFunctionsOnASingleLine: None -# Disable for now since it complicates initial migration tests, -# TODO: look into enabling this in the future. -SortIncludes: false +SortIncludes: true # Don't right align escaped newlines to the right because we have a wide default AlignEscapedNewlines: DontAlign |