CVS: cvs.openbsd.org: src

[James Turner]

CVSROOT:        /cvs
Module name:    src
Changes by:     jtur...@cvs.openbsd.org 2015/04/19 08:23:41

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

Log message:
Merge conflicts