Merge branch 'sqlite-release' into prerelease-int
commit58acc8269ffc6ba3693fa763ea0364c546eb3996
authorStephen Lombardo <sjlombardo@zetetic.net>
Thu, 15 Nov 2012 23:46:41 +0000 (15 18:46 -0500)
committerStephen Lombardo <sjlombardo@zetetic.net>
Thu, 15 Nov 2012 23:46:41 +0000 (15 18:46 -0500)
treed3211d54815fa204e765dfb5ae786f195e8f4766
parentfc04d69470f2f5221ef77521902061757da35538
parent801e036cd83c3605ffef32c2d1234c7231cb94f3
Merge branch 'sqlite-release' into prerelease-int
Makefile.in
src/func.c
src/pager.c
src/pragma.c
tool/mksqlite3c.tcl