Merge branch 'jgkamat-editorconfig'

This commit is contained in:
Florian Bruhin 2016-04-06 18:54:51 +02:00
commit 9698af72e8
3 changed files with 19 additions and 0 deletions

17
.editorconfig Normal file
View File

@ -0,0 +1,17 @@
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
max_line_length = 79
indent_style = space
indent_size = 4
[*.yml]
indent_size = 2
[*.feature]
max_line_length = 9999

View File

@ -25,6 +25,7 @@ recursive-exclude doc *.asciidoc
include doc/qutebrowser.1.asciidoc
prune tests
prune qutebrowser/3rdparty
exclude .editorconfig
exclude pytest.ini
exclude qutebrowser.rcc
exclude .coveragerc

View File

@ -219,6 +219,7 @@ Contributors, sorted by the number of commits in descending order:
* Matthias Lisin
* Marcel Schilling
* Jean-Christophe Petkovich
* Jay Kamat
* Helen Sherwood-Taylor
* HalosGhost
* Gregor Pohl