naruse	2013-04-18 22:58:49 +0900 (Thu, 18 Apr 2013)

  New Revision: 40356

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40356

  Log:
    Fix ChangeLog duplicated by wrong merge

  Modified files:
    trunk/ChangeLog

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40355)
+++ ChangeLog	(revision 40356)
@@ -1,41 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Thu Apr 18 08:20:48 2013  NARUSE, Yui  <naruse@r...>
-
-	* common.mk (clean-ext): remove timestamps.
-
-Wed Apr 17 22:07:50 2013  Tanaka Akira  <akr@f...>
-
-	* ext/socket/rubysocket.h (SOCKLEN_MAX): Expression simplified.
-
-Wed Apr 17 20:09:19 2013  Aman Gupta  <ruby@t...>
-
-	* compile.c (iseq_add_mark_object): Use new rb_iseq_add_mark_object().
-
-	* insns.def (setinlinecache): Ditto.
-
-	* iseq.c (rb_iseq_add_mark_object): New function to allocate
-	  iseq->mark_ary on demand. [Bug #8142]
-
-	* iseq.h (rb_iseq_add_mark_object): Ditto.
-
-	* iseq.c (prepare_iseq_build): Avoid allocating mark_ary until needed.
-
-	* iseq.c (rb_iseq_build_for_ruby2cext): Ditto.
-
-Wed Apr 17 19:45:27 2013  Aman Gupta  <tmm1@r...>
-
-	* iseq.c (iseq_location_setup): re-use existing string when iseq has
-	  the same path and absolute_path. [Bug #8149]
-
-Wed Apr 17 11:38:37 2013  Nobuyoshi Nakada  <nobu@r...>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  UNASSIGNED is not a valid message.
-
-Wed Apr 17 10:58:18 2013  Nobuyoshi Nakada  <nobu@r...>
-
-	* thread.c (sleep_timeval): get rid of overflow on Windows where
-	  timeval.tv_sec is not time_t but mere long.
-
 Thu Apr 18 16:58:51 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_method.c (rb_mod_public_method): fix visibility on anonymous

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/