From 52f7c3f5ef6d9b70ec385fb390bf27962e68ee3d Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Mon, 8 Mar 1999 21:02:20 +0000
Subject: Resolve merge conflicts; minor comment changes.

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

(limited to 'FAQ')

diff --git a/FAQ b/FAQ
index d4665e3..da9cd75 100644
--- a/FAQ
+++ b/FAQ
@@ -5,14 +5,14 @@
 INDEX
 -----
 
-Q 1	How do I get pthreads-win32 to link under Cygwin32 or Mingw32?
+Q 1	How do I get pthreads-win32 to link under Cygwin or Mingw32?
 
 Q 2	Now that pthreads-win32 builds under Mingw32, why do I get
 	memory access violations?
 
 =============================================================================
 
-Q 1	How do I get pthreads-win32 to link under Cygwin32 or Mingw32?
+Q 1	How do I get pthreads-win32 to link under Cygwin or Mingw32?
 ---
 
 A 1
-- 
cgit v1.2.3