PERFORCE change 59021 for review
Robert Watson
rwatson at FreeBSD.org
Fri Aug 6 13:42:50 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=59021
Change 59021 by rwatson at 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 <sys/param.h>
==== //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 <sys/param.h>
==== //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
More information about the p4-projects
mailing list