From af7147ea732912655271b43c517524835cbbcd74 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Jan 2009 01:09:10 +0000
Subject: merge revision(s) 18355: 	* eval.c (timeofday): use monotonic
 clock.  based on a patch 	  from zimbatm <zimbatm@oree.ch> in
 [ruby-core:16627].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index bdb047a506..8df88b75ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan  7 10:06:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (timeofday): use monotonic clock.  based on a patch
+	  from zimbatm <zimbatm@oree.ch> in [ruby-core:16627].
+
 Tue Jan  6 09:02:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (yylex): 8 and 9 in octal integer should cause compile
-- 
cgit v1.2.3