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/ChangeLog | |
parent | 4a267501525be3157b0d41e9030e9d4a9c7f5897 (diff) | |
download | egawk-4fd10562c474ec13a932b51ed31bddbd5ffd28c4.tar.gz egawk-4fd10562c474ec13a932b51ed31bddbd5ffd28c4.tar.bz2 egawk-4fd10562c474ec13a932b51ed31bddbd5ffd28c4.zip |
Remove git merge droppings in m4 directory.
Diffstat (limited to 'm4/ChangeLog')
-rw-r--r-- | m4/ChangeLog | 4 |
1 files changed, 4 insertions, 0 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: |