diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2006-07-17 16:12:37 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2006-07-17 16:12:37 +0000 |
| commit | 9f77d94b9a58350d763499ea39873c6020b60da9 (patch) | |
| tree | 710c75c43c07e91771e598b34a15217e8928560c /gnu/usr.bin/texinfo/po/ChangeLog | |
| parent | 6382053c52b4c3b43d337c169d7b476c6081457f (diff) | |
conflict resolution
Diffstat (limited to 'gnu/usr.bin/texinfo/po/ChangeLog')
| -rw-r--r-- | gnu/usr.bin/texinfo/po/ChangeLog | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/usr.bin/texinfo/po/ChangeLog b/gnu/usr.bin/texinfo/po/ChangeLog index af1087b1751..b965d4e334d 100644 --- a/gnu/usr.bin/texinfo/po/ChangeLog +++ b/gnu/usr.bin/texinfo/po/ChangeLog @@ -1,9 +1,14 @@ -2002-03-14 gettextize <bug-gnu-gettext@gnu.org> +2004-02-05 gettextize <bug-gnu-gettext@gnu.org> - * ORIG: New file, from gettext-0.11.1. + * Makefile.in.in: Upgrade to gettext-0.14.1. + * ORIG: New file, from gettext-0.14.1. + * Rules-quot: Upgrade to gettext-0.14.1. -2002-03-14 gettextize <bug-gnu-gettext@gnu.org> +2003-12-20 gettextize <bug-gnu-gettext@gnu.org> - * ORIG: New file, from gettext-0.11.1. - * remove-potcdate.sin: New file, from gettext-0.11.1. + * ORIG: New file, from gettext-0.13.1. + +2003-12-13 gettextize <bug-gnu-gettext@gnu.org> + + * ORIG: New file, from gettext-0.13. |