head 1.2; access; symbols netbsd-5-2-3-RELEASE:1.2 netbsd-5-1-5-RELEASE:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base:1.2 netbsd-5-2-2-RELEASE:1.2 netbsd-5-1-4-RELEASE:1.2 netbsd-5-2-1-RELEASE:1.2 netbsd-5-1-3-RELEASE:1.2 netbsd-5-2:1.2.0.8 netbsd-5-2-RELEASE:1.2 netbsd-5-2-RC1:1.2 netbsd-5-1-2-RELEASE:1.2 netbsd-5-1-1-RELEASE:1.2 netbsd-5-1:1.2.0.6 netbsd-5-1-RELEASE:1.2 netbsd-5-1-RC4:1.2 netbsd-5-1-RC3:1.2 netbsd-5-1-RC2:1.2 netbsd-5-1-RC1:1.2 netbsd-5-0-2-RELEASE:1.2 netbsd-5-0-1-RELEASE:1.2 netbsd-5-0:1.2.0.4 netbsd-5-0-RELEASE:1.2 netbsd-5-0-RC4:1.2 netbsd-5-0-RC3:1.2 netbsd-5-0-RC2:1.2 netbsd-5-0-RC1:1.2 netbsd-5:1.2.0.2 netbsd-5-base:1.2 v4-4-0_beforeimport:1.1.1.1 netbsd-1-6-PATCH002-RELEASE:1.1.1.1 netbsd-1-6-PATCH002:1.1.1.1 netbsd-1-6-PATCH002-RC4:1.1.1.1 v4-3-0-2003-12-19:1.1.1.1 netbsd-1-6-PATCH002-RC3:1.1.1.1 netbsd-1-6-PATCH002-RC2:1.1.1.1 netbsd-1-6-PATCH002-RC1:1.1.1.1 netbsd-1-6:1.1.1.1.0.2 netbsd-1-6-base:1.1.1.1 v4-3-0:1.1.1.1 v4-3-0_beforeimport:1.1.1.1 netbsd-1-6-PATCH001:1.1.1.1 netbsd-1-6-RELEASE:1.1.1.1 v4-2-1:1.1.1.1 v4-2-1_beforeimport:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 v4-2-0:1.1.1.1 XF86:1.1.1; locks; strict; comment @# @; 1.2 date 2004.03.05.16.33.04; author tron; state dead; branches; next 1.1; 1.1 date 2002.01.19.15.08.29; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.01.19.15.08.29; author tron; state Exp; branches; next ; desc @@ 1.2 log @Resolve conflicts from import of XFree86 4.4.0. @ text @