[cairo-commit] cairo ChangeLog,1.1151,1.1152

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog 
Log Message:

2005-11-21  Carl Worth  <cworth at cworth.org>

        * src/pixman-remap.h: Remove duplicate definitions of
        pixman_color_to_pixel and pixman_composite.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -d -r1.1151 -r1.1152
--- ChangeLog	21 Nov 2005 18:50:20 -0000	1.1151
+++ ChangeLog	21 Nov 2005 19:46:40 -0000	1.1152
@@ -1,5 +1,10 @@
 2005-11-21  Carl Worth  <cworth at cworth.org>
 
+	* src/pixman-remap.h: Remove duplicate definitions of
+	pixman_color_to_pixel and pixman_composite.
+
+2005-11-21  Carl Worth  <cworth at cworth.org>
+
 	* ROADMAP: Add reminder to fix all memory leaks (as determined by
 	the test suite) before release 1.2.0.