CVS: cvs.openbsd.org: src

[Landry Breuil]

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

Modified files:
        usr.bin/sqlite3: shell.c 

Log message:
merge conflicts, and kill a few more kittens while here.