diff options
Diffstat (limited to 'm4/ChangeLog')
| -rw-r--r-- | m4/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index f099c857..4e4e7c84 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +<<<<<<< HEAD +2012-04-01 John Haque <j.eh@mchsi.com> + + * mpfr.m4: New file. +======= 2012-04-27 Arnold D. Robbins <arnold@skeeve.com> Update to autoconf 2.69, automake 1.12. @@ -6,6 +11,7 @@ intlmacosx.m4, intmax.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lock.m4, longlong.m4, printf-posix.m4, size_max.m4, stdint_h.m4, uintmax_t.m4, visibility.m4, wchar_t.m4, wint_t.m4, xsize.m4: Updated. +>>>>>>> gawk-4.0-stable 2012-03-30 Arnold D. Robbins <arnold@skeeve.com> |