CVS: cvs.openbsd.org: src

[James Turner]

CVSROOT:        /cvs
Module name:    src
Changes by:     jtur...@cvs.openbsd.org 2015/04/04 17:25:54

Modified files:
        lib/libsqlite3/src: loadext.c os_unix.c parse.y random.c 
        lib/libsqlite3/tool: lemon.c 

Log message:
Merge conflicts