Merge branch 'master' into bug/msys-python

1 files changed, 26 insertions, 0 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..1889885a7
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,26 @@
+# EditorConfig file for SCons project
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+[*.py]
+max_line_length = 78
+ensure_newline_before_comments = true
+include_trailing_comma = true
+use_parentheses = true
+
+[*.xml]
+indent_size = 2
+
+[*.rst]
+indent_size = 3
+
+[*.bat]
+end_of_line = crlf