Move stuff to correct ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 5c719d77d8cbc19f226cd465f79682ddfb9c3809..c3a619d99f1ce6377007162fd2c3d825089dc5ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,6 @@
 2005-12-14  Michael Natterer  <mitch@imendio.com>
 
-       * gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_load_lines): new
-       utility function which factors out massive code duplication from
-       the commit below.
-
-2005-12-14  Michael Natterer  <mitch@imendio.com>
-
-       * gdk-pixbuf/io-jpeg.c: applied patch from maemo-gtk which avoids
-       the allocation of an intermediate buffer for non-progressive
-       jpegs. Fixed bug #305894.
-
-       * tests/test-images/valid_jpeg_progressive_test: new test image so
-       we can test both loading code paths in io-jpeg.c
+       * tests/test-images/valid_jpeg_progressive_test: new test image.
 
 Tue Dec 13 09:47:20 2005  Tim Janik  <timj@gtk.org>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5c719d77d8cbc19f226cd465f79682ddfb9c3809..c3a619d99f1ce6377007162fd2c3d825089dc5ec 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,17 +1,6 @@
 2005-12-14  Michael Natterer  <mitch@imendio.com>
 
-       * gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_load_lines): new
-       utility function which factors out massive code duplication from
-       the commit below.
-
-2005-12-14  Michael Natterer  <mitch@imendio.com>
-
-       * gdk-pixbuf/io-jpeg.c: applied patch from maemo-gtk which avoids
-       the allocation of an intermediate buffer for non-progressive
-       jpegs. Fixed bug #305894.
-
-       * tests/test-images/valid_jpeg_progressive_test: new test image so
-       we can test both loading code paths in io-jpeg.c
+       * tests/test-images/valid_jpeg_progressive_test: new test image.
 
 Tue Dec 13 09:47:20 2005  Tim Janik  <timj@gtk.org>
 

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index d6dc0421d5388b759f56c84c1a929d5eebcb6ae9..66f5af1296b6f47e4808989f20416e97a585e434 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-14  Michael Natterer  <mitch@imendio.com>
+
+       * io-jpeg.c (gdk_pixbuf__jpeg_image_load_lines): new utility
+       function which factors out massive code duplication from the
+       commit below.
+
+2005-12-14  Michael Natterer  <mitch@imendio.com>
+
+       * io-jpeg.c: applied patch from maemo-gtk which avoids the
+       allocation of an intermediate buffer for non-progressive
+       jpegs. Fixed bug #305894.
+
 2005-11-15  Matthias Clasen  <mclasen@redhat.com>
 
        * io-xpm.c: Fix several integer overflows which have been