Skip to content

Commit f0ded2f

Browse files
author
Martin Klang
committed
Merge branch 'develop' into maximilian
2 parents 94680d0 + 1ca0035 commit f0ded2f

84 files changed

Lines changed: 4716 additions & 1240 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
BasedOnStyle: WebKit
3+
BreakBeforeBinaryOperators: None
4+
ColumnLimit: '80'
5+
CompactNamespaces: 'false'
6+
SpaceBeforeParens: Never
7+
SpaceInEmptyParentheses: 'false'
8+
Standard: Cpp11
9+
TabWidth: '4'
10+
UseTab: Never
11+
AlwaysBreakTemplateDeclarations: 'Yes'
12+
IndentWidth: '4'
13+
ContinuationIndentWidth: '4'
14+
AllowShortFunctionsOnASingleLine: None
15+
PenaltyExcessCharacter: '2'
16+
PointerAlignment: 'Left'
17+
SortIncludes: 'false'
18+
SpaceBeforeParens: ControlStatements
19+
BreakBeforeBraces: Custom
20+
BraceWrapping:
21+
AfterClass: false
22+
AfterControlStatement: false
23+
AfterEnum: false
24+
AfterFunction: false
25+
AfterNamespace: false
26+
AfterObjCDeclaration: false
27+
AfterStruct: false
28+
AfterUnion: false
29+
BeforeCatch: false
30+
BeforeElse: true
31+
IndentBraces: false
32+
33+
...

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@
3232
*.app
3333

3434
Source/progname.s
35+
36+
#Unignore this - because .lib extension is ignored for libraries
37+
!FaustCode/owl.lib

0 commit comments

Comments
 (0)