head	1.2;
access;
symbols
	netbsd-7-2-RELEASE:1.1.1.1
	netbsd-7-1-2-RELEASE:1.1.1.1
	netbsd-7-1-1-RELEASE:1.1.1.1
	netbsd-7-1:1.1.1.1.0.14
	netbsd-7-1-RELEASE:1.1.1.1
	netbsd-7-1-RC2:1.1.1.1
	netbsd-7-1-RC1:1.1.1.1
	netbsd-7-0-2-RELEASE:1.1.1.1
	netbsd-7-0-1-RELEASE:1.1.1.1
	netbsd-7-0:1.1.1.1.0.12
	netbsd-7-0-RELEASE:1.1.1.1
	netbsd-7-0-RC3:1.1.1.1
	netbsd-7-0-RC2:1.1.1.1
	netbsd-7-0-RC1:1.1.1.1
	netbsd-6-0-6-RELEASE:1.1.1.1
	netbsd-6-1-5-RELEASE:1.1.1.1
	netbsd-7:1.1.1.1.0.10
	netbsd-7-base:1.1.1.1
	netbsd-6-1-4-RELEASE:1.1.1.1
	netbsd-6-0-5-RELEASE:1.1.1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.1
	riastradh-drm2:1.1.1.1.0.8
	riastradh-drm2-base:1.1.1.1
	netbsd-6-1-3-RELEASE:1.1.1.1
	netbsd-6-0-4-RELEASE:1.1.1.1
	netbsd-6-1-2-RELEASE:1.1.1.1
	netbsd-6-0-3-RELEASE:1.1.1.1
	netbsd-6-1-1-RELEASE:1.1.1.1
	xorg-server-1-10-6:1.1.1.1
	netbsd-6-1:1.1.1.1.0.6
	netbsd-6-0-2-RELEASE:1.1.1.1
	netbsd-6-1-RELEASE:1.1.1.1
	netbsd-6-1-RC4:1.1.1.1
	netbsd-6-1-RC3:1.1.1.1
	netbsd-6-1-RC2:1.1.1.1
	netbsd-6-1-RC1:1.1.1.1
	netbsd-6-0-1-RELEASE:1.1.1.1
	netbsd-6-0:1.1.1.1.0.4
	netbsd-6-0-RELEASE:1.1.1.1
	netbsd-6-0-RC2:1.1.1.1
	netbsd-6-0-RC1:1.1.1.1
	netbsd-6:1.1.1.1.0.2
	netbsd-6-base:1.1.1.1
	xorg-server-1-10-3:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2016.08.11.00.04.29;	author mrg;	state dead;
branches;
next	1.1;
commitid	FQxwnZNPy5ZgOOhz;

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

1.1.1.1
date	2011.08.02.06.56.52;	author mrg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@first merge of netbsd changes.  not tested yet.
@
text
@‰PNG

   IHDR      8   ³»   fIDATxíÝIB1Q;uÛ¿@@ÑÏh;áÚ ±aË !ŽÐ‹V½CÈíþ âŠÅÆ|c±˜¾™¶¶3èsÑFÐFP»S{PšSšsVãlN®F.F.“ã2’ˆüµ¤ï_U¿Œ¾˜Ïþ«‰ÈH Ým”°•    IEND®B`‚@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of xorg-server 1.10.3.  highlights include:
	- fixes xorg bugs 29969, 30367, 30527, 30267, 30260, 29046,
	  30260, 31548, 28672, 24887, 32115, 21457, 32436, 21827,
	  28414, 24703, 32803, 16318, 33449, 33324, 33929, 35082,
	  35209, 36146, 36119
	- many additional NULL checks
	- adjustments related to input ABI 12
	- *lots* of dead code removal
	- vga arbitrator fixes
	- GL fixes
	- EDID fixes
	- conversion to using asprintf() in many places
	- many fixes from valgrind, compiler warnings

see these for more details:
http://lists.freedesktop.org/archives/xorg-announce/2011-February/001612.html
http://lists.freedesktop.org/archives/xorg-announce/2011-April/001646.html
http://lists.freedesktop.org/archives/xorg-announce/2011-May/001675.html
http://lists.freedesktop.org/archives/xorg-announce/2011-July/001710.html
@
text
@@