From 7d27a815b614d93698b6d3de4c8a102e35d9fe99 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:40:24 +0000
Subject:   23.  Merged with XFree86 4.4.0. Added changes that went into
 infected        files. Reverted darwin/bundle/**/Credits.rtf to XFree86
 versions        to avoid future conflicts on ASCII but not humal readable
 files.        (There should probably be separate CreditsXorg.rtf files)      
  (Egbert Eich).

---
 src/i830_accel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/i830_accel.c')

diff --git a/src/i830_accel.c b/src/i830_accel.c
index ee67e399..64cf365a 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -32,7 +32,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_accel.c,v 1.9 2003/12/22 12:27:07 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_accel.c,v 1.8 2003/04/24 18:00:24 eich Exp $ */
 
 /*
  * Reformatted with GNU indent (2.2.8), using the following options:
-- 
cgit v1.2.3