From 328024cc25cba67c939cf51da6ab6409635fa227 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Fri, 18 Aug 2006 14:23:14 -0700
Subject: [PATCH] ROADMAP: Punt the AIX -lpthread bug off of the 1.2.4 roadmap.

---
 ROADMAP | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ROADMAP b/ROADMAP
index 227c8fbc8..1650616ef 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -30,8 +30,8 @@ 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
- - 7744: Compile troubles on AIX
 ✓- SVG backend requires PNG
 ✓- 7888: assertion failure with rotated bitmap glyphs
 ✓- 7889: cairo_text_path assertion failure on bitmap fonts
@@ -42,9 +42,9 @@ cairo-1.2.4 (August 21, 2006): Fix build bugs with 1.2.2
 
  Things that we are letting slip from 1.2.4
  ------------------------------------------
+ - 7744: Compile troubles on AIX
  - PS/PDF Type1/Type3 problem with rotated font_matrices
 
-
 cairo-1.4 (October 2006): Better performance
  - New tessellator
  - New rasterization