Merge branch 'NewValera'

# Conflicts: # SOFI3D_org/bin/snapmerge # SOFI3D_org/bin/sofi3D # SOFI3D_org/par/in_and_out/sofi3D.jout # SOFI3D_org/par/in_and_out/sofi3D.json # SOFI3D_org/par/startSOFI3D.sh
swag-kaust · Dec 7, 2016 · d94158e · d94158e
2 parents 0914536 + 128ba44
commit d94158e
Show file tree

Hide file tree

Showing 18 changed files with 4,415 additions and 1,628 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,12 @@
+BasedOnStyle: Chromium
+AlignTrailingComments: true
+BreakBeforeBraces: Allman
+ColumnLimit: 0
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: false
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PointerBindsToType: false
+SpacesBeforeTrailingComments: 1
+TabWidth: 8
+UseTab: Never