Module Name: src
Committed By: christos
Date: Wed Dec 25 22:03:15 UTC 2013
Modified Files:
src/external/bsd/smbfs/dist/examples: dot.nsmbrc
src/external/bsd/smbfs/dist/include/netsmb: smb_lib.h
src/external/bsd/smbfs/dist/lib/smb: cfopt.c ctx.c file.c kiconv.c
mbuf.c nb.c nb_name.c nb_net.c nbns_rq.c nls.c print.c rap.c
rcfile.c rq.c subr.c
src/external/bsd/smbfs/dist/mount_smbfs: mount_smbfs.8 mount_smbfs.c
src/external/bsd/smbfs/dist/smbutil: common.h dumptree.c login.c
print.c smbutil.1 smbutil.c view.c
Added Files:
src/external/bsd/smbfs: Makefile Makefile.inc
src/external/bsd/smbfs/dist/mount_smbfs: mount_smbfs.h
src/external/bsd/smbfs/lib: Makefile
src/external/bsd/smbfs/lib/libsmb: Makefile
src/external/bsd/smbfs/sbin: Makefile
src/external/bsd/smbfs/sbin/mount_smbfs: Makefile
src/external/bsd/smbfs/usr.bin: Makefile
src/external/bsd/smbfs/usr.bin/smbutil: Makefile
Removed Files:
src/external/bsd/smbfs/dist/mount_smbfs: getmntopts.c mntopts.h
Log Message:
- merge conflicts (updating to the version that was actually imported)
- add build glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/Makefile \
src/external/bsd/smbfs/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/smbfs/dist/examples/dot.nsmbrc
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/smbfs/dist/include/netsmb/smb_lib.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/smbfs/dist/lib/smb/cfopt.c \
src/external/bsd/smbfs/dist/lib/smb/ctx.c \
src/external/bsd/smbfs/dist/lib/smb/file.c \
src/external/bsd/smbfs/dist/lib/smb/kiconv.c \
src/external/bsd/smbfs/dist/lib/smb/mbuf.c \
src/external/bsd/smbfs/dist/lib/smb/nb.c \
src/external/bsd/smbfs/dist/lib/smb/nb_name.c \
src/external/bsd/smbfs/dist/lib/smb/nb_net.c \
src/external/bsd/smbfs/dist/lib/smb/nbns_rq.c \
src/external/bsd/smbfs/dist/lib/smb/nls.c \
src/external/bsd/smbfs/dist/lib/smb/print.c \
src/external/bsd/smbfs/dist/lib/smb/rap.c \
src/external/bsd/smbfs/dist/lib/smb/rcfile.c \
src/external/bsd/smbfs/dist/lib/smb/rq.c \
src/external/bsd/smbfs/dist/lib/smb/subr.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/smbfs/dist/mount_smbfs/getmntopts.c \
src/external/bsd/smbfs/dist/mount_smbfs/mntopts.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.8 \
src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.c
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/smbfs/dist/smbutil/common.h \
src/external/bsd/smbfs/dist/smbutil/dumptree.c \
src/external/bsd/smbfs/dist/smbutil/login.c \
src/external/bsd/smbfs/dist/smbutil/print.c \
src/external/bsd/smbfs/dist/smbutil/smbutil.1 \
src/external/bsd/smbfs/dist/smbutil/smbutil.c \
src/external/bsd/smbfs/dist/smbutil/view.c
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/lib/libsmb/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/sbin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/sbin/mount_smbfs/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/usr.bin/smbutil/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
