head	1.2;
access;
symbols
	netbsd-7-2-RELEASE:1.1.1.3.2.1
	netbsd-7-1-2-RELEASE:1.1.1.3.2.1
	netbsd-7-1-1-RELEASE:1.1.1.3.2.1
	netbsd-7-1:1.1.1.3.2.1.0.4
	netbsd-7-1-RELEASE:1.1.1.3.2.1
	netbsd-7-1-RC2:1.1.1.3.2.1
	netbsd-7-1-RC1:1.1.1.3.2.1
	netbsd-7-0-2-RELEASE:1.1.1.3.2.1
	netbsd-7-0-1-RELEASE:1.1.1.3.2.1
	netbsd-7-0:1.1.1.3.2.1.0.2
	netbsd-7-0-RELEASE:1.1.1.3.2.1
	netbsd-7-0-RC3:1.1.1.3.2.1
	netbsd-7-0-RC2:1.1.1.3.2.1
	netbsd-7-0-RC1:1.1.1.3.2.1
	netbsd-6-0-6-RELEASE:1.1.1.2
	netbsd-6-1-5-RELEASE:1.1.1.2
	netbsd-7:1.1.1.3.0.2
	netbsd-7-base:1.1.1.3
	MesaLib-7-11-2:1.1.1.3
	netbsd-6-1-4-RELEASE:1.1.1.2
	netbsd-6-0-5-RELEASE:1.1.1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2
	riastradh-drm2:1.1.1.2.0.8
	riastradh-drm2-base:1.1.1.2
	netbsd-6-1-3-RELEASE:1.1.1.2
	netbsd-6-0-4-RELEASE:1.1.1.2
	netbsd-6-1-2-RELEASE:1.1.1.2
	netbsd-6-0-3-RELEASE:1.1.1.2
	netbsd-6-1-1-RELEASE:1.1.1.2
	netbsd-6-1:1.1.1.2.0.6
	netbsd-6-0-2-RELEASE:1.1.1.2
	netbsd-6-1-RELEASE:1.1.1.2
	netbsd-6-1-RC4:1.1.1.2
	netbsd-6-1-RC3:1.1.1.2
	netbsd-6-1-RC2:1.1.1.2
	netbsd-6-1-RC1:1.1.1.2
	netbsd-6-0-1-RELEASE:1.1.1.2
	netbsd-6-0:1.1.1.2.0.4
	netbsd-6-0-RELEASE:1.1.1.2
	netbsd-6-0-RC2:1.1.1.2
	netbsd-6-0-RC1:1.1.1.2
	netbsd-6:1.1.1.2.0.2
	netbsd-6-base:1.1.1.2
	MesaLib-7-8-2:1.1.1.2
	MesaLib-7-7-1:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2014.12.18.06.11.36;	author mrg;	state dead;
branches;
next	1.1;
commitid	Ae59RsLlS9l0cu2y;

1.1
date	2010.05.23.21.22.33;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2010.05.23.21.22.33;	author mrg;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2010.07.19.05.31.48;	author mrg;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2014.07.09.19.39.11;	author riastradh;	state Exp;
branches
	1.1.1.3.2.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.3.2.1
date	2015.01.06.09.26.24;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;


desc
@@


1.2
log
@merge Mesa 10.3.5.
@
text
@TOP = ../../../../..
include $(TOP)/configs/current

LIBNAME = xlib

LIBRARY_INCLUDES = \
	-I$(TOP)/include \
	-I$(TOP)/src/mesa

C_SOURCES = \
	glx_api.c \
	glx_getproc.c \
	glx_usefont.c \
	xm_api.c

include ../../../Makefile.template
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of MesaLib-7.7.1
@
text
@@


1.1.1.2
log
@import Mesa 7.8.2, lib part.  major changes since 7.7.1:
- several new extensions for various drivers
- many i965, i915 driver fixes
- many glsl fixes
@
text
@d8 1
a8 2
	-I$(TOP)/src/mesa \
	$(X11_CFLAGS)
@


1.1.1.3
log
@import MesaLib 7.11.2

Brings in support for Intel Sandy Bridge and Ivy Bridge hardware, a
new shader language compiler, and various other improvements too
numerous to list here; see <http://www.mesa3d.org/relnotes.html> for
details.
@
text
@a7 1
	-I$(TOP)/src/mapi \
d15 1
a15 2
	xm_api.c \
	xm_st.c
@


1.1.1.3.2.1
log
@File removals that accidently did not happen during pullup of the new
MesaLib for ticket #381
@
text
@@