[Midnightbsd-cvs] src: dev/syscons: merge

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge

Modified Files:
--------------
    src/sys/dev/syscons:
        scgfbrndr.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scgfbrndr.c?r1=1.2&r2=1.3)
        schistory.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/schistory.c?r1=1.2&r2=1.3)
        scmouse.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scmouse.c?r1=1.4&r2=1.5)
        scterm.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scterm.c?r1=1.2&r2=1.3)
        scvesactl.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scvesactl.c?r1=1.2&r2=1.3)
        scvgarndr.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scvgarndr.c?r1=1.2&r2=1.3)
        scvidctl.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scvidctl.c?r1=1.2&r2=1.3)
        scvtb.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scvtb.c?r1=1.2&r2=1.3)
        syscons.c (r1.14 -> r1.15)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/syscons.c?r1=1.14&r2=1.15)
        syscons.h (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/syscons.h?r1=1.6&r2=1.7)
        sysmouse.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/sysmouse.c?r1=1.3&r2=1.4)
    src/sys/dev/syscons/apm:
        apm_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/apm/apm_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/blank:
        blank_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/blank/blank_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/daemon:
        daemon_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/daemon/daemon_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/dragon:
        dragon_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/dragon/dragon_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/fade:
        fade_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/fade/fade_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/fire:
        fire_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/fire/fire_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/green:
        green_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/green/green_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/logo:
        logo.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/logo/logo.c?r1=1.2&r2=1.3)
        logo_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/logo/logo_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/rain:
        rain_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/rain/rain_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/snake:
        snake_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/snake/snake_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/star:
        star_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/star/star_saver.c?r1=1.2&r2=1.3)
    src/sys/dev/syscons/warp:
        warp_saver.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/warp/warp_saver.c?r1=1.2&r2=1.3)

Removed Files:
-------------
    src/sys/dev/syscons:
        scterm-dumb.c
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scterm-dumb.c)
        scterm-sc.c
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/scterm-sc.c)
        sctermvar.h
        (http://cvsweb.midnightbsd.org/src/sys/dev/syscons/sctermvar.h)