Skip to content
Snippets Groups Projects
Commit 59c7810c authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

Merge remote-tracking branch 'project-template/master' into update-project-template

parents dbbb0c6b 5e963a4f
No related branches found
No related tags found
No related merge requests found
......@@ -53,7 +53,7 @@ PenaltyBreakString: '10000'
PenaltyExcessCharacter: '700'
PenaltyReturnTypeOnItsOwnLine: '500'
PointerAlignment: Left
ReflowComments: 'false'
ReflowComments: 'true'
SortIncludes: 'false'
SortUsingDeclarations: 'false'
SpaceAfterCStyleCast: 'false'
......
......@@ -6,6 +6,7 @@
build
.project
.cproject
.pydevproject
.settings
.kdev4
*.kdev4
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment