Skip to content

Commit

Permalink
Merge pull request #8 from coin-or/shotone
Browse files Browse the repository at this point in the history 
Merge working branch for SHOT 1 into master
  • Loading branch information
@andreaslundell
andreaslundell authored Oct 21, 2019
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.
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 11 additions & 0 deletions .clang-format
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
Language: Cpp
BasedOnStyle: WebKit
BreakBeforeBraces: Allman
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 120
IndentWrappedFunctionNames: true
SortIncludes: false
SpaceBeforeParens: Never
SpaceInEmptyParentheses: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
408 changes: 0 additions & 408 deletions .coin-or/projDesc.xml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*.out
*.app

.vs/*
.vscode/*
build/*
MSVisualStudio/*
/.vs
/out/build
Loading

0 comments on commit af8c155

Please sign in to comment.