CVS commit: src/external/public-domain/sqlite/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Feb 16 18:09:44 UTC 2014

Modified Files:
        src/external/public-domain/sqlite/dist: sqlite3.c

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/sqlite/dist/sqlite3.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.