Merge pull request #8 from coin-or/shotone

Merge working branch for SHOT 1 into master
coin-or · Oct 21, 2019 · af8c155 · af8c155
2 parents c5d02ec + b4b10d6
commit af8c155
Show file tree

Hide file tree

Showing 5,260 changed files with 1,061,748 additions and 21,097 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,11 @@
+---
+Language: Cpp
+BasedOnStyle: WebKit
+BreakBeforeBraces: Allman
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit: 120
+IndentWrappedFunctionNames: true
+SortIncludes: false
+SpaceBeforeParens: Never
+SpaceInEmptyParentheses: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
diff --git a/.coin-or/projDesc.xml b/.coin-or/projDesc.xml
diff --git a/.gitignore b/.gitignore
@@ -27,7 +27,7 @@
 *.out
 *.app
 
-.vs/*
 .vscode/*
 build/*
-MSVisualStudio/*
+/.vs
+/out/build