[Midnightbsd-cvs] src: lib/ncurses: resolve conflicts

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/lib/ncurses:
        Makefile.inc (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/lib/ncurses/Makefile.inc?r1=1.3&r2=1.4)
        config.mk (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/lib/ncurses/config.mk?r1=1.3&r2=1.4)
    src/lib/ncurses/ncurses:
        Makefile (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/lib/ncurses/ncurses/Makefile?r1=1.3&r2=1.4)
        ncurses_cfg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/lib/ncurses/ncurses/ncurses_cfg.h?r1=1.2&r2=1.3)
        pathnames.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/lib/ncurses/ncurses/pathnames.h?r1=1.2&r2=1.3)