merges r23292 and r23348 from trunk into ruby_1_9_1.

--
* .gitignore: added.
--
* svn:ignore, .gitignore: merged.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 81 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..80ca128593
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,77 @@
+*.bak
+*.dylib
+*.inc
+*.orig
+*.rej
+*.sav
+*.swp
+*_prelude.c
+*~
+.*-*
+.*.list
+.*.time
+.DS_Store
+.ccmalloc
+.ext
+.git
+.pc
+.ppack
+.svn
+COPYING.LIB
+ChangeLog-1.8.0
+ChangeLog.pre-alpha
+ChangeLog.pre1_1
+Doxyfile
+GNUmakefile
+Makefile
+README.atheos
+README.fat-patch
+README.v6
+TAGS
+archive
+autom4te*.cache
+automake
+beos
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+config.status.lineno
+configure
+enc.mk
+enc/trans/*.c
+encdb.h
+ext/win32ole/.document
+largefile.h
+lex.c
+libruby*.*
+miniprelude.c
+miniruby
+newdate.rb
+newline.c
+newver.rb
+parse.c
+parse.h
+patches
+patches-master
+pitest.rb
+ppack
+prelude.c
+preview
+rbconfig.rb
+rename2.h
+repack
+revision.h
+riscos
+rubicon
+ruby
+ruby-man.rd.gz
+test.rb
+tmp
+transdb.h
+uncommon.mk
+web
+y.output
+y.tab.c
+yasmdata.rb
diff --git a/ChangeLog b/ChangeLog
index f81d730d0c..f2726d9d3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Apr 26 20:21:39 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .gitignore: added.
+
 Fri May  1 13:18:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval_intern.h (_longjmp): never return.  see [ruby-core:23241]