diff options
| author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-04 12:37:11 +0000 |
|---|---|---|
| committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-04 12:37:11 +0000 |
| commit | 8519a2d581209e774b52ff8510b6c444971c1021 (patch) | |
| tree | 717409a425674e7b6747915930f974b702cec4b7 | |
| parent | 6837f3dc54ac4afd89c185e520c250ef2eb42c4e (diff) | |
* ChangeLog: Remove garbages.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -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] |