yugui	2008-12-28 16:33:49 +0900 (Sun, 28 Dec 2008)

  New Revision: 21109

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

  Log:
    mistake in merging. reverts r21108.

  Modified directories:
    branches/ruby_1_9_1/


Property changes on: ruby_1_9_1
___________________________________________________________________
Name: svn:ignore
   - *.bak
*.inc
*.orig
*.rej
*.sav
*~
.*-*
.*.list
.*.time
.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
encdb.h
largefile.h
lex.c
libruby*.*
*.dylib
miniprelude.c
miniruby
newdate.rb
newver.rb
newline.c
parse.c
parse.h
patches
patches-master
pitest.rb
ppack
prelude.c
preview
rbconfig.rb
rename2.h
revision.h
repack
riscos
rubicon
ruby
ruby-man.rd.gz
test.rb
tmp
transdb.h
uncommon.mk
web
y.output
y.tab.c
yasmdata.rb
*_prelude.c

   + *.bak
*.inc
*.orig
*.rej
*.sav
*~
.*-*
.*.list
.*.time
.ccmalloc
.ext
.git
.pc
.ppack
.svn
COPYING.LIB
ChangeLog-1.8.0
ChangeLog.pre-alpha
ChangeLog.pre1_1
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
encdb.h
largefile.h
lex.c
libruby*.*
*.dylib
miniprelude.c
miniruby
newdate.rb
newver.rb
newline.c
parse.c
parse.h
patches
patches-master
pitest.rb
ppack
prelude.c
preview
rbconfig.rb
rename2.h
revision.h
repack
riscos
rubicon
ruby
ruby-man.rd.gz
test.rb
tmp
transdb.h
uncommon.mk
web
y.output
y.tab.c
yasmdata.rb
*_prelude.c



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