[cairo-commit] cairo ChangeLog,1.1026.2.15,1.1026.2.16

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv3159

Modified Files:
      Tag: BRANCH_1_0
	ChangeLog 
Log Message:

2005-09-26  Carl Worth  <cworth at cworth.org>

        Backported from HEAD:
        2005-08-31  Owen Taylor  <otaylor at redhat.com>

        * test/cairo-test.c: Protect inclusion of fontconfig.h
        with HAVE_FCFINI.

        * test/nil-surface.c: Remove stray cairo-ft.h include.

        * test/nil-surface.c: Include stddef.h for NULL.

        * test/create-from-png-stream.c (draw): Open the file rb.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1026.2.15
retrieving revision 1.1026.2.16
diff -u -d -r1.1026.2.15 -r1.1026.2.16
--- ChangeLog	26 Sep 2005 16:09:37 -0000	1.1026.2.15
+++ ChangeLog	26 Sep 2005 22:43:17 -0000	1.1026.2.16
@@ -1,3 +1,17 @@
+2005-09-26  Carl Worth  <cworth at cworth.org>
+
+	Backported from HEAD:
+	2005-08-31  Owen Taylor  <otaylor at redhat.com>
+
+	* test/cairo-test.c: Protect inclusion of fontconfig.h
+	with HAVE_FCFINI.
+
+	* test/nil-surface.c: Remove stray cairo-ft.h include.
+
+	* test/nil-surface.c: Include stddef.h for NULL.
+
+	* test/create-from-png-stream.c (draw): Open the file "rb".
+
 2005-09-26  Tor Lillqvist  <tml at novell.com>
 
 	* src/cairo-win32-font.c (_win32_scaled_font_get_scaled_hfont),