diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-10-27 21:51:20 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-10-27 21:51:20 +0200 |
| commit | 4fd10562c474ec13a932b51ed31bddbd5ffd28c4 (patch) | |
| tree | 7bfbf1cf1a8b95a142d317e01b46185469ea3861 /m4 | |
| parent | 4a267501525be3157b0d41e9030e9d4a9c7f5897 (diff) | |
| download | gawk-4fd10562c474ec13a932b51ed31bddbd5ffd28c4.tar.gz | |
Remove git merge droppings in m4 directory.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/intl.m4 | 4 | ||||
| -rw-r--r-- | m4/po.m4 | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 8c64cfb5..8489f90e 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2012-10-27 Arnold D. Robbins <arnold@skeeve.com> + + * po.m4, intl.m4: Fix droppings left over from a git merge. + 2012-05-21 Andrew J. Schorr <aschorr@telemetry-investments.com> * libtool.m4, ltoptions.m4, ltsugar.m4, ltversion.m4, lt~obsolete.m4: @@ -25,11 +25,7 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. AC_DEFUN([AM_INTL_SUBDIR], [ AC_REQUIRE([AC_PROG_INSTALL])dnl -<<<<<<< HEAD - AC_REQUIRE([AC_PROG_MKDIR])dnl defined by automake -======= AC_REQUIRE([AC_PROG_MKDIR_P])dnl ->>>>>>> gawk-4.0-stable AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([gt_GLIBC2])dnl @@ -24,11 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -<<<<<<< HEAD - AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake -======= AC_REQUIRE([AC_PROG_MKDIR_P])dnl ->>>>>>> gawk-4.0-stable AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that |