[cairo-commit] pycairo ChangeLog,1.39,1.40

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/pycairo
In directory gabe:/tmp/cvs-serv18294

Modified Files:
	ChangeLog 
Log Message:

        * cairo/pycairo.h: Track split-up of cairo.h.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ChangeLog	12 Jan 2005 07:09:05 -0000	1.39
+++ ChangeLog	20 Jan 2005 16:38:03 -0000	1.40
@@ -1,4 +1,7 @@
-=== PyCairo snapshot 0.1.4 ===
+2005-01-20  Carl Worth  <cworth at cworth.org>
+
+	* cairo/pycairo.h: Track split-up of cairo.h.
+
 2005-01-12  Steve Chaplin  <steve1097 at yahoo.com.au>
 	
 	* configure.ac: Increment pycairo version to 0.1.4
@@ -26,6 +29,7 @@
 	* configure.ac: add --without-pygtk option
 	* README: add './configure --without-pygtk' example
 
+>>>>>>> 1.39
 2004-12-14  Steve Chaplin  <steve1097 at yahoo.com.au>
 
 	* README: added notes to describe compiling and how to avoid PYTHONPATH