Received: by mail.netbsd.org (Postfix, from userid 605)
	id E97EC14A430; Mon, 20 Jul 2015 01:48:44 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 9DEC514A42A
	for <source-changes@NetBSD.org>; Mon, 20 Jul 2015 01:48:43 +0000 (UTC)
X-Virus-Scanned: amavisd-new at NetBSD.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id UeKjIWjgYho8 for <source-changes@NetBSD.org>;
	Mon, 20 Jul 2015 01:48:42 +0000 (UTC)
Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd])
	by mail.netbsd.org (Postfix) with ESMTP id AEA8C14A426
	for <source-changes@NetBSD.org>; Mon, 20 Jul 2015 01:48:42 +0000 (UTC)
Received: by cvs.netbsd.org (Postfix, from userid 500)
	id AB7E598; Mon, 20 Jul 2015 01:48:42 +0000 (UTC)
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
MIME-Version: 1.0
Date: Mon, 20 Jul 2015 01:48:42 +0000
From: "matthew green" <mrg@netbsd.org>
Subject: CVS commit: xsrc/external/mit
To: source-changes@NetBSD.org
X-Mailer: log_accum
Message-Id: <20150720014842.AB7E598@cvs.netbsd.org>
Sender: source-changes-owner@NetBSD.org
List-Id: source-changes.NetBSD.org
Precedence: bulk
Reply-To: source-changes-d@NetBSD.org
Mail-Reply-To: "matthew green" <mrg@netbsd.org>
Mail-Followup-To: source-changes-d@NetBSD.org

Module Name:	xsrc
Committed By:	mrg
Date:		Mon Jul 20 01:48:42 UTC 2015

Modified Files:
	xsrc/external/mit/xf86-input-keyboard/dist/src: xf86OSKbd.h
	xsrc/external/mit/xf86-video-vesa/dist: Makefile.in aclocal.m4
	    config.guess config.h.in config.sub configure configure.ac depcomp
	    install-sh ltmain.sh missing
	xsrc/external/mit/xf86-video-vesa/dist/man: Makefile.in
	xsrc/external/mit/xf86-video-vesa/dist/src: Makefile.in vesa.c vesa.h

Log Message:
merge xf86-input-keyboard 1.8.1 and xf86-video-vesa 2.3.4.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-vesa/dist/Makefile.in \
    xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 \
    xsrc/external/mit/xf86-video-vesa/dist/configure \
    xsrc/external/mit/xf86-video-vesa/dist/configure.ac \
    xsrc/external/mit/xf86-video-vesa/dist/depcomp \
    xsrc/external/mit/xf86-video-vesa/dist/install-sh \
    xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh \
    xsrc/external/mit/xf86-video-vesa/dist/missing
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-vesa/dist/config.guess \
    xsrc/external/mit/xf86-video-vesa/dist/config.sub
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-vesa/dist/config.h.in
cvs rdiff -u -r1.7 -r1.8 \
    xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in
cvs rdiff -u -r1.7 -r1.8 \
    xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.