From owner-p4-projects@FreeBSD.ORG Fri Aug 6 20:42:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF56016A4D1; Fri, 6 Aug 2004 20:42:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8845D16A4CE for ; Fri, 6 Aug 2004 20:42:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64AE143D3F for ; Fri, 6 Aug 2004 20:42:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i76KgnKd029057 for ; Fri, 6 Aug 2004 20:42:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i76Kgnx0029052 for perforce@freebsd.org; Fri, 6 Aug 2004 20:42:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 6 Aug 2004 20:42:49 GMT Message-Id: <200408062042.i76Kgnx0029052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 59021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 20:42:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=59021 Change 59021 by rwatson@rwatson_paprika on 2004/08/06 20:42:40 Integrate netperf_socket (top-up) from FreeBSD CVS. Affected files ... .. //depot/projects/netperf_socket/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/netperf_socket/sys/modules/splash/bmp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/splash/bmp/splash_bmp.c#3 delete .. //depot/projects/netperf_socket/sys/modules/splash/pcx/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/splash/pcx/splash_pcx.c#3 delete Differences ... ==== //depot/projects/netperf_socket/sys/dev/fb/splash_bmp.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/splash_bmp.c,v 1.18 2004/05/30 20:23:28 phk Exp $ + * $FreeBSD: src/sys/dev/fb/splash_bmp.c,v 1.19 2004/08/06 20:37:08 des Exp $ */ #include ==== //depot/projects/netperf_socket/sys/dev/fb/splash_pcx.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/splash_pcx.c,v 1.6 2004/05/30 20:23:29 phk Exp $ + * $FreeBSD: src/sys/dev/fb/splash_pcx.c,v 1.7 2004/08/06 20:37:08 des Exp $ */ #include ==== //depot/projects/netperf_socket/sys/modules/splash/bmp/Makefile#2 (text+ko) ==== @@ -1,4 +1,6 @@ -# $FreeBSD: src/sys/modules/splash/bmp/Makefile,v 1.8 2002/11/06 13:46:59 nyan Exp $ +# $FreeBSD: src/sys/modules/splash/bmp/Makefile,v 1.9 2004/08/06 20:37:08 des Exp $ + +.PATH: ${.CURDIR}/../../../dev/fb KMOD= splash_bmp SRCS= splash_bmp.c ==== //depot/projects/netperf_socket/sys/modules/splash/pcx/Makefile#2 (text+ko) ==== @@ -1,4 +1,6 @@ -# $FreeBSD: src/sys/modules/splash/pcx/Makefile,v 1.6 2002/01/11 15:48:57 ru Exp $ +# $FreeBSD: src/sys/modules/splash/pcx/Makefile,v 1.7 2004/08/06 20:37:08 des Exp $ + +.PATH: ${.CURDIR}/../../../dev/fb KMOD= splash_pcx SRCS= splash_pcx.c