summaryrefslogtreecommitdiff
path: root/usr.bin/sqlite3
AgeCommit message (Expand)Author
2015-04-04Merge conflictsJames Turner
2015-03-16Merge conflictsJames Turner
2014-09-29Merge conflicts.James Turner
2014-03-24Merge conflictsJames Turner
2013-09-21Merge conflicts.James Turner
2013-07-01Link sqlite3(1) against libedit and add an empty history.h header forMartin Pieuchot
2013-06-09merge conflicts, and kill a few more kittens while here.Landry Breuil
2013-03-18yet another stupid conflictMarc Espie
2012-11-29fix stupid cvs conflictMarc Espie
2012-06-04mergeMarc Espie
2012-05-25grr... another C99-only assignment.Marc Espie
2012-04-14glue and manpage, which I forgot aboutMarc Espie
2012-04-14minor update to 3.7.12.1Marc Espie
2012-04-14sqlite3 shell, vendor 3.7.11Marc Espie