441. Import Mesa-4.0.4, and resync with the DRI trunk (DRI Project).

This commit is contained in:
Alan Hourihane 2002-10-30 12:52:06 +00:00
parent d04246c8fc
commit dd7c85f108
2 changed files with 4 additions and 4 deletions

View File

@ -60,13 +60,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/* $XFree86$ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/i810/i810_cursor.c,v 1.2 2001/12/10 16:34:20 keithp Exp $ */
/* i810_cursor.c: KDrive hardware cursor routines for the i810 chipset */ /* i810_cursor.c: KDrive hardware cursor routines for the i810 chipset */
/* /*
* Authors: * Authors:
* Keith Whitwell <keithw@precisioninsight.com> * Keith Whitwell <keith@tungstengraphics.com>
* Pontus Lidman <pontus.lidman@nokia.com> * Pontus Lidman <pontus.lidman@nokia.com>
* *
*/ */

View File

@ -57,11 +57,11 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/ **************************************************************************/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v 1.4 2000/09/26 15:57:12 tsi Exp $ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/i810/i810_reg.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
/* /*
* Authors: * Authors:
* Keith Whitwell <keithw@precisioninsight.com> * Keith Whitwell <keith@tungstengraphics.com>
* Pontus Lidman <pontus.lidman@nokia.com> * Pontus Lidman <pontus.lidman@nokia.com>
* *
* based on the i740 driver by * based on the i740 driver by