From 748d23eded748a67f428e61e6020bb81a4139059 Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Mar 2004 14:19:22 +0000
Subject: Add --version option to ri

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 9a6337c59..00308e018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 25 23:15:24 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_options.rb (RI::Options::show_version): 
+	  Add --version option
+
 Thu Mar 25 21:45:00 2004  Shigeo Kobayashi <shigek@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c: Bug in + and - reported by Bret Jolly
@@ -10,7 +15,6 @@ Thu Mar 25 21:01:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/resource.rb: ditto.
 
->>>>>>> 1.3093
 Thu Mar 25 19:37:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
-- 
cgit