diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-20 07:06:06 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-20 07:06:06 +0000 |
| commit | 2b64e10feb46cf6fafc57a036e80ee497806213f (patch) | |
| tree | cdaabe69f35f0c14fd8979ecbeac6af134c37354 /ChangeLog | |
| parent | a9fefe7555a43152b21c589a2582ba212ece4d82 (diff) | |
remove garbages.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -1,17 +1,14 @@ -<<<<<<< .mine Thu Sep 20 10:56:08 2012 NAKAMURA Usaku <usa@ruby-lang.org> * test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning with another method. if the substitution is removed, the ExtSrv object will be GC'ed and some tests will be blocked. -======= Thu Sep 20 10:30:00 2012 Zachary Scott <zzak@ruby-lang.org> * lib/find.rb: Error in documentation example Found by Herwin Weststrate, thank you! ->>>>>>> .r36994 Thu Sep 20 07:20:00 2012 Zachary Scott <zzak@ruby-lang.org> * complex.c: Examples for Complex Documentation. @@ -26,7 +23,7 @@ Thu Sep 20 07:15:00 2012 Zachary Scott <zzak@ruby-lang.org> Thu Sep 20 07:05:00 2012 Zachary Scott <zzak@ruby-lang.org> - * lib/csv.rb (Object#CSV, Array#to_csv, String#parse_csv): + * lib/csv.rb (Object#CSV, Array#to_csv, String#parse_csv): Examples and documentation for CSV. [Bug #6880] [ruby-core:47218] |