* merged from trunk r26747:26885.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/mvm@26886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
iain · Mar 12, 2010 · 8483ed1 · 8483ed1
1 parent 519f1bc
commit 8483ed1
Show file tree

Hide file tree

Showing 143 changed files with 19,118 additions and 2,639 deletions.
diff --git a/.indent.pro b/.indent.pro
@@ -0,0 +1,21 @@
+-bap
+-nbbb
+-nbc
+-br
+-nbs
+-ncdb
+-ce
+-cli0.5
+-ndj
+-ei
+-nfc1
+-i4
+-l120
+-lp
+-npcs
+-psl
+-sc
+-sob
+
+-TID
+-TVALUE
diff --git a/.merged-trunk-revision b/.merged-trunk-revision
@@ -1 +1 @@
-26747
+26885