diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-05 02:37:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-05 02:37:41 +0000 |
| commit | 1692d4933845fad2f35fd949e9473688029da00b (patch) | |
| tree | c31c016f8e991b8a736b40f6dc114ff51b64683c /ChangeLog | |
| parent | 1d50afc2a201dbac64caed4df35b6ff44c1fc38e (diff) | |
mkmf.rb: different strings from conflict markers
* lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
strings from conflict markers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Wed Dec 5 11:37:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different + strings from conflict markers. + Wed Dec 5 04:25:00 2012 Zachary Scott <zachary@zacharyscott.net> * lib/README: Add rdoc modeline directive and formatting libs |