Module name: mbuf
Committed by: pcahyna
Date: Sat Feb 17 17:05:29 UTC 2007
Modified Files:
mbuf/userland/mbuf_impl: uipc_mbuf.c uipc_mbuf2.c
mbuf/userland/mbuf_impl/sys: mbuf.h
Log Message:
resolve conflicts.
To generate a diff of this commit:
cvs -z3 rdiff -u -r1.15 -r1.16 mbuf/userland/mbuf_impl/sys/mbuf.h
cvs -z3 rdiff -u -r1.16 -r1.17 mbuf/userland/mbuf_impl/uipc_mbuf2.c
cvs -z3 rdiff -u -r1.19 -r1.20 mbuf/userland/mbuf_impl/uipc_mbuf.c
To view a diff of this commit:
http://netbsd-soc.cvs.sourceforge.net/netbsd-soc/mbuf/userland/mbuf_impl/sys/mbuf.h?r1=1.15&r2=1.16
http://netbsd-soc.cvs.sourceforge.net/netbsd-soc/mbuf/userland/mbuf_impl/uipc_mbuf2.c?r1=1.16&r2=1.17
http://netbsd-soc.cvs.sourceforge.net/netbsd-soc/mbuf/userland/mbuf_impl/uipc_mbuf.c?r1=1.19&r2=1.20
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NetBSD-SoC-cvs mailing list
NetBSD-SoC-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/netbsd-soc-cvs
