[cairo-commit] cairo/pixman ChangeLog,1.117.2.3,1.117.2.4

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/pixman
In directory gabe:/tmp/cvs-serv22792/pixman

Modified Files:
      Tag: BRANCH_1_0
	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/pixman/ChangeLog,v
retrieving revision 1.117.2.3
retrieving revision 1.117.2.4
diff -u -d -r1.117.2.3 -r1.117.2.4
--- ChangeLog	18 Nov 2005 18:17:29 -0000	1.117.2.3
+++ ChangeLog	21 Nov 2005 19:49:34 -0000	1.117.2.4
@@ -1,3 +1,8 @@
+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-18  Carl Worth  <cworth at cworth.org>
 
 	* src/pixman-remap.h: Remove spurios INT_ prefixes which break the