Merge branch 'blender2.7'

[blender.git] / .editorconfig

diff --git a/.editorconfig b/.editorconfig
index af00a0976214b1433f07fd1e79fbe42a838a9630..691643adebe66a1bac91d1ef243f4e66ce0960c0 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,17 +4,17 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
-indent_size = 4
-max_line_length = 120
+indent_size = 2
+max_line_length = 99
 
 # CMake & Text
 [*.{cmake,txt}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = tab
-indent_size = 4
-max_line_length = 120
+indent_style = space
+indent_size = 2
+max_line_length = 99
 
 # Python
 [*.py]
@@ -30,6 +30,15 @@ max_line_length = 120
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = tab
-indent_size = 4
+indent_style = space
+indent_size = 2
+max_line_length = 99
+
+# reStructuredText
+[*.rst]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 3
 max_line_length = 120