1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ChangeLog: Remove garbages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2012-11-04 12:37:11 +00:00
parent 6837f3dc54
commit 8519a2d581

View file

@ -1,12 +1,9 @@
<<<<<<< HEAD
=======
Sun Nov 4 20:29:46 2012 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* lib/cgi.rb, lib/cgi/*/rb: rename CGI#header to CGI#http_header,
add and update HTML5 tag generater. [Bug #7110]
Patch provided by Marcus Stollsteimer, thank you !
>>>>>>> * lib/fileutils.rb (module FileUtils): repatch [ruby-core:39622]
Sun Nov 4 11:47:39 2012 Masaki Matsushita <glass.saga@gmail.com>
* lib/fileutils.rb (module FileUtils): repatch [ruby-core:39622]