Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a22ae5f authored Mar 10, 2017 by Christopher Ferris Committed by Gerrit Code Review Mar 10, 2017

Merge "Add a 2 width option of clang format."

parents e7195be7 a78d9a29

.clang-format

deleted100644 → 0

+1 −13

Original line number	Original line	Diff line number	Diff line
	BasedOnStyle: Google
	AllowShortBlocksOnASingleLine: false
	AllowShortFunctionsOnASingleLine: false

	AccessModifierOffset: -2
	ColumnLimit: 100
	CommentPragmas: NOLINT:.*
	DerivePointerAlignment: false
	IndentWidth: 4
	PointerAlignment: Left
	TabWidth: 4
	UseTab: Never
	PenaltyExcessCharacter: 32

.clang-format

0 → 120000

+1 −13

Original line number	Original line	Diff line number	Diff line
			.clang-format-4
			No newline at end of file

.clang-format-2

0 → 100644

+13 −0

Original line number	Original line	Diff line number	Diff line
			BasedOnStyle: Google
			AllowShortBlocksOnASingleLine: false
			AllowShortFunctionsOnASingleLine: true

			AccessModifierOffset: -1
			ColumnLimit: 100
			CommentPragmas: NOLINT:.*
			DerivePointerAlignment: false
			IndentWidth: 2
			PointerAlignment: Left
			TabWidth: 2
			UseTab: Never
			PenaltyExcessCharacter: 32

.clang-format-4

0 → 100644

+13 −0

Original line number	Original line	Diff line number	Diff line
			BasedOnStyle: Google
			AllowShortBlocksOnASingleLine: false
			AllowShortFunctionsOnASingleLine: false

			AccessModifierOffset: -2
			ColumnLimit: 100
			CommentPragmas: NOLINT:.*
			DerivePointerAlignment: false
			IndentWidth: 4
			PointerAlignment: Left
			TabWidth: 4
			UseTab: Never
			PenaltyExcessCharacter: 32

libbacktrace/.clang-format

0 → 120000

+1 −0

Original line number	Original line	Diff line number	Diff line
			../.clang-format-2
			No newline at end of file

.clang-format

100644 → 120000

+1 −13

File changed.File mode changed from 100644 to 120000.

Contains only whitespace changes.