From 0f074e654630858aa44010065928a93d2a53c0ef Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 17 May 2010 12:31:21 +0000
Subject: [PATCH] * .gitignore: updated.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 .gitignore | 16 ++++++++++++++++
 ChangeLog  |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3212d4a1f4..e2f0893cea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -241,6 +241,12 @@
 /ext/io/nonblock/mkmf.log
 /ext/io/nonblock/nonblock.a
 
+# /ext/io/console/
+/ext/io/console/Makefile
+/ext/io/console/extconf.h
+/ext/io/console/mkmf.log
+/ext/io/console/console.a
+
 # /ext/io/wait/
 /ext/io/wait/Makefile
 /ext/io/wait/extconf.h
@@ -257,6 +263,11 @@
 /ext/json/ext/generator/extconf.h
 /ext/json/ext/generator/mkmf.log
 /ext/json/ext/generator/generator.a
+/ext/json/generator/*.def
+/ext/json/generator/Makefile
+/ext/json/generator/extconf.h
+/ext/json/generator/mkmf.log
+/ext/json/generator/generator.a
 
 # /ext/json/ext/parser/
 /ext/json/ext/parser/*.def
@@ -264,6 +275,11 @@
 /ext/json/ext/parser/extconf.h
 /ext/json/ext/parser/mkmf.log
 /ext/json/ext/parser/parser.a
+/ext/json/parser/*.def
+/ext/json/parser/Makefile
+/ext/json/parser/extconf.h
+/ext/json/parser/mkmf.log
+/ext/json/parser/parser.a
 
 # /ext/mathn/complex/
 /ext/mathn/complex/Makefile
diff --git a/ChangeLog b/ChangeLog
index c34c811561..329f973d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 17 21:30:50 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* .gitignore: updated.
+
 Mon May 17 21:08:53 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (argv_size): merged into join_argv() to maintain the