[Midnightbsd-cvs] src: usr.bin/gdb: resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
resolve conflicts

Modified Files:
--------------
    src/gnu/usr.bin/gdb:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/Makefile?r1=1.2&r2=1.3)
        Makefile.inc (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/Makefile.inc?r1=1.3&r2=1.4)
    src/gnu/usr.bin/gdb/gdb:
        gdb.1 (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/gdb/gdb.1?r1=1.2&r2=1.3)
    src/gnu/usr.bin/gdb/kgdb:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/kgdb/Makefile?r1=1.2&r2=1.3)
        kgdb.1 (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/kgdb/kgdb.1?r1=1.2&r2=1.3)
        kgdb.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/kgdb/kgdb.h?r1=1.2&r2=1.3)
        kthr.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/kgdb/kthr.c?r1=1.2&r2=1.3)
        main.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/kgdb/main.c?r1=1.2&r2=1.3)
        trgt_amd64.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c?r1=1.2&r2=1.3)
        trgt_i386.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c?r1=1.2&r2=1.3)
    src/gnu/usr.bin/gdb/libgdb:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/libgdb/Makefile?r1=1.2&r2=1.3)
        fbsd-threads.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c?r1=1.2&r2=1.3)

Added Files:
-----------
    src/gnu/usr.bin/gdb/arch/powerpc:
        Makefile (r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/arch/powerpc/Makefile?rev=1.3&content-type=text/x-cvsweb-markup)
        config.h (r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/arch/powerpc/config.h?rev=1.3&content-type=text/x-cvsweb-markup)
        init.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/arch/powerpc/init.c?rev=1.3&content-type=text/x-cvsweb-markup)
    src/gnu/usr.bin/gdb/kgdb:
        trgt_powerpc.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c?rev=1.3&content-type=text/x-cvsweb-markup)