From 465b6b07249897ecd63213e1d85ed759c0010759 Mon Sep 17 00:00:00 2001 From: Chris Cantwell Date: Sun, 6 Mar 2016 12:34:47 +0000 Subject: [PATCH] Moved clang-format requirement back to 3.7. --- .clang-format | 1 + CONTRIBUTING.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index cb3eef848..9c3964ad8 100644 --- a/.clang-format +++ b/.clang-format @@ -1,5 +1,6 @@ BasedOnStyle: LLVM AlignAfterOpenBracket: true +AlignConsecutiveAssignments: true IndentWidth: 4 AlwaysBreakAfterDefinitionReturnType: None PenaltyReturnTypeOnItsOwnLine: 9999999 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0918595c0..a51c4207a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -199,7 +199,7 @@ for new files, or cosmetic `tidy/*` branches, but try to stick to existing formatting elsewhere. Installing it is straightforward on most package managers. Nektar++ relies on -options that are used in version 3.6 or later. +options that are used in version 3.7 or later. There are a number of instructions on how to use `clang-format` inside a number of text editors on the -- GitLab