xserver: Branch 'master'

[Egbert Eich]

 hw/xfree86/int10/helper_exec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 1d11e4bc4ccb169fb23fc18583f0b648f0a6a4e0 (from 45efe85003195bd45501630cef08349abb180c3a)
Author: Egbert Eich <eich at freedesktop.org>
Date:   Thu Aug 30 12:50:21 2007 +0200

    Fixing a misleading comment which could suggest a GPL violation.
    
    The author of the int10 code looked at the VBIOS POSTing code
    in DOSEMU to get some initial idea on how to POST a VBIOS.
    To give credit to the DOSEMU Team for this inspiration a comment
    was added to the code which could suggest that code from the
    GPLed DOSEMU was directly incorporated into this code.
    This patch should clearify the situation.

diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 3e1051d..e833426 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -3,8 +3,8 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  *
- *   Part of this is based on code taken from DOSEMU
- *   (C) Copyright 1992, ..., 1999 the "DOSEMU-Development-Team"
+ *   Part of this code was inspired  by the VBIOS POSTing code in DOSEMU
+ *   developed by the "DOSEMU-Development-Team"
  */
 
 /*