Fix stray commit marker

This commit is contained in:
Owen Taylor 2005-06-28 05:02:27 +00:00
parent 3b0c3d0ee8
commit f3b7d3dfd8

View file

@ -58,7 +58,6 @@
(_cairo_win32_surface_set_clip_region):
* test/Makefile.am:
>>>>>>> 1.689
2005-06-24 Carl Worth <cworth@cworth.org>
* src/cairo-ft-font.c: (_cairo_ft_unscaled_font_create_glyph):