[Midnightbsd-cvs] src: btx/btx: resolve conflicts

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/boot/i386/btx/btx:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/btx/btx/Makefile?r1=1.2&r2=1.3)
        btx.S (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/btx/btx/btx.S?r1=1.4&r2=1.5)
    src/sys/boot/i386/btx/btxldr:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/btx/btxldr/Makefile?r1=1.2&r2=1.3)
        btxldr.S (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/btx/btxldr/btxldr.S?r1=1.2&r2=1.3)
    src/sys/boot/i386/btx/lib:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/btx/lib/Makefile?r1=1.2&r2=1.3)
        btxv86.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/btx/lib/btxv86.h?r1=1.2&r2=1.3)

Removed Files:
-------------
    src/sys/boot/i386/btx/lib:
        btxcsu.s
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/btx/lib/btxcsu.s)