diff options
| author | Carl Worth <cworth@cworth.org> | 2006-08-18 14:25:53 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2006-08-18 14:25:53 -0700 |
| commit | ab092a9a5db70ac16e782cf0d7d3629cc902cc1e (patch) | |
| tree | fbd607863106f85ebd8335253c72ae20baaebcd1 /ROADMAP | |
| parent | 328024cc25cba67c939cf51da6ab6409635fa227 (diff) | |
| download | cairo-ab092a9a5db70ac16e782cf0d7d3629cc902cc1e.tar.gz | |
ROADMAP: Remove stray conflict marker
Diffstat (limited to 'ROADMAP')
| -rw-r--r-- | ROADMAP | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -30,7 +30,6 @@ from mozilla, (clip querying), and much-improved performance. Themes and Schedules ==================== cairo-1.2.4 (August 21, 2006): Fix build bugs with 1.2.2 -<<<<<<< .merge_file_3a6nj4 ✓- xlib detection requires libXt ✓- SVG backend requires PNG ✓- 7888: assertion failure with rotated bitmap glyphs |