aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-15 23:16:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-15 23:16:15 +0000
commitfdd8d5badca40c9d514c52c32c791b58165c2087 (patch)
treee767eb01b13bdae734e8a7f97edd23ea3c00c298
parent47b642bdd318d55884ef9d1143787456da63539b (diff)
downloadruby-fdd8d5badca40c9d514c52c32c791b58165c2087.tar.gz
.editorconfig: new
* .editorconfig: add. [ruby-core:47548] [Feature #7030] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.editorconfig16
-rw-r--r--ChangeLog4
2 files changed, 20 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..67abf4b978
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+tab_width = 8
+indent_style = tab
+indent_size = 4
+
+[**.bat]
+end_of_line = crlf
+
+[**.rb]
+indent_style = space
+indent_size = 2
diff --git a/ChangeLog b/ChangeLog
index bef6f39091..eef9b690b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 16 08:16:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * .editorconfig: add. [ruby-core:47548] [Feature #7030]
+
Sat Sep 15 01:56:40 2012 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c: Merge upstream: 50a383c84.