diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | pango/Makefile.am | 1 |
4 files changed, 28 insertions, 5 deletions
@@ -1,5 +1,16 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + #307433, Sebastien Bacher + + * Makefile.am (EXTRA_DIST): Name the Change.pre-* + correctly. + + * pango/Makefile.am (libpango_1_0_la_SOURCES): Add + pango-color-table.h. + +2005-06-14 Owen Taylor <otaylor@redhat.com> + + * pango/pango-utils.c: Fix docs, handle a lone '~' (#169851, Morten Welinder) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 557c32fa..042e2167 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,16 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + #307433, Sebastien Bacher + + * Makefile.am (EXTRA_DIST): Name the Change.pre-* + correctly. + + * pango/Makefile.am (libpango_1_0_la_SOURCES): Add + pango-color-table.h. + +2005-06-14 Owen Taylor <otaylor@redhat.com> + + * pango/pango-utils.c: Fix docs, handle a lone '~' (#169851, Morten Welinder) diff --git a/Makefile.am b/Makefile.am index 5596c2ad..2cc34aa9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,11 +17,11 @@ EXTRA_DIST = \ pangoxft-uninstalled.pc.in \ pangoft2-uninstalled.pc.in \ pangowin32-uninstalled.pc.in \ - ChangeLog.pre-1.0 \ - ChangeLog.pre-1.2 \ - ChangeLog.pre-1.4 \ - ChangeLog.pre-1.6 \ - ChangeLog.pre-1.8 \ + ChangeLog.pre-1-0 \ + ChangeLog.pre-1-2 \ + ChangeLog.pre-1-4 \ + ChangeLog.pre-1-6 \ + ChangeLog.pre-1-8 \ TODO.xml \ README.win32 \ pango-zip.sh \ diff --git a/pango/Makefile.am b/pango/Makefile.am index 995c99ea..cf0748b5 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -66,6 +66,7 @@ libpango_1_0_la_SOURCES = \ modules.c \ pango-attributes.c \ pango-color.c \ + pango-color-table.h \ pango-context.c \ pango-coverage.c \ pango-engine.c \ |