CVS: cvs.openbsd.org: src

[Landry Breuil]

CVSROOT:        /cvs
Module name:    src
Changes by:     lan...@cvs.openbsd.org  2013/06/09 08:45:48

Modified files:
        lib/libsqlite3/src: parse.y loadext.c 

Log message:
merge conflicts