summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 1 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 059cb1e..76884d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]