Merge branch 'features/progressive-aging'

# Conflicts: # VarroaPopDoc.cpp
jpireaud · Feb 18, 2022 · 518ab40 · 518ab40
2 parents a2eea07 + be29cb5
commit 518ab40
Show file tree

Hide file tree

Showing 156 changed files with 48,888 additions and 2,927 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,10 @@
+BasedOnStyle: Microsoft
+TabWidth: 4
+UseTab: ForIndentation
+AccessModifierOffset: -4
+DerivePointerAlignment: false
+PointerAlignment: Left
+AllowShortFunctionsOnASingleLine: InlineOnly
+AlignConsecutiveDeclarations: true
+AllowShortIfStatementsOnASingleLine: Always
+AlignAfterOpenBracket: AlwaysBreak