fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-09 04:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix stray commit marker

Browse source
This commit is contained in:
Owen Taylor 2005-06-28 05:02:27 +00:00
parent 3b0c3d0ee8
commit f3b7d3dfd8
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

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