From 2339b25be75c727fccb333eb977987cd0c41e3e4 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Jul 19 2017 14:10:19 +0000 Subject: Merge branch 'clang' --- diff --git a/.clang-format b/.clang-format index 633f1da..0867ef5 100644 --- a/.clang-format +++ b/.clang-format @@ -43,5 +43,6 @@ SpaceInEmptyParentheses: false SpacesInCStyleCastParentheses: false SpaceAfterControlStatementKeyword: true ContinuationIndentWidth: 4 +SortIncludes: false ...