Skip to content

Commit

Permalink
Merge branch 'UncleRus:master' into feature-shift-reg
Browse files Browse the repository at this point in the history
  • Loading branch information
JaimeAlbq authored Feb 7, 2024
2 parents 90b4edb + 6b9cdc3 commit ff3d19d
Show file tree
Hide file tree
Showing 451 changed files with 24,545 additions and 6,475 deletions.
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: false
Expand Down Expand Up @@ -37,7 +37,7 @@ BraceWrapping:
SplitEmptyNamespace: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: BeforeColon
ColumnLimit: 120
ColumnLimit: 200
CompactNamespaces: true
Cpp11BracedListStyle: false
FixNamespaceComments: true
Expand Down
Loading

0 comments on commit ff3d19d

Please sign in to comment.