Module Name:	src
Committed By:	tv
Date:		Wed Feb 10 22:18:25 UTC 1999

Modified Files:
	src/gnu/dist/gdb: Makefile.in alpha-tdep.c arm-tdep.c arm-xdep.c
	    configure configure.in dbxread.c defs.h gdb.1 infptrace.c
	    m68k-tdep.c m68knbsd-nat.c main.c mips-tdep.c ns32k-tdep.c
	    ns32knbsd-nat.c os9kread.c printcmd.c ser-unix.c solib.c top.c
	    utils.c vax-tdep.c
	src/gnu/dist/gdb/config/arm: tm-nbsd.h
	src/gnu/dist/gdb/config/i386: tm-nbsd.h
	src/gnu/dist/gdb/config/m68k: tm-m68k.h tm-sun3.h
	src/gnu/dist/gdb/config/ns32k: tm-nbsd.h tm-ns32km3.h
	src/gnu/dist/gdb/config/powerpc: ppc-sim.mt ppcle-sim.mt
	src/gnu/dist/gdb/config/rs6000: tm-rs6000.h
	src/gnu/dist/gdb/doc: gdbint.texinfo stabs.texinfo
	src/gnu/dist/gdb/rdi-share: adp.h adperr.h angel.h ardi.c ardi.h
	    armdbg.h buffers.h bytesex.c bytesex.h chandefs.h channels.h
	    chanpriv.h crc.c crc.h dbg_conf.h dbg_cp.h dbg_hif.h dbg_rdi.h
	    devclnt.h devices.h devsw.c devsw.h drivers.c drivers.h endian.h
	    etherdrv.c ethernet.h hostchan.c hostchan.h hsys.c hsys.h logging.c
	    logging.h msgbuild.c msgbuild.h params.c params.h rx.c rxtx.h
	    serdrv.c serpardr.c sys.h tx.c unixcomm.c unixcomm.h
Log Message:
Conflict resolution, and update NetBSD changes to 4.17.