]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge latest trunk changes.
authordan <dan@noemail.net>
Wed, 12 Feb 2014 14:43:01 +0000 (14:43 +0000)
committerdan <dan@noemail.net>
Wed, 12 Feb 2014 14:43:01 +0000 (14:43 +0000)
FossilOrigin-Name: 4d7057c4942464b4302031a1ee9f195700c5e66d

1  2 
manifest
manifest.uuid

diff --cc manifest
index d7bc58d067fe64d35c46b63774ed9895d8d5ffa2,19a6fafab1cded000323903998c0c260ceb71a82..7f2b597396a7bea56f7082bca2321b2480cfb831
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Test\scase\supdates\sto\saccount\sfor\sthe\sfact\sthat\sdatabase\sfiles\sare\snot\screated\suntil\sthey\sare\sfirst\swritten.
- D 2014-02-11T19:35:42.768
 -C Increase\sthe\sversion\snumber\sto\s3.8.4
 -D 2014-02-11T16:24:34.448
++C Merge\slatest\strunk\schanges.
++D 2014-02-12T14:43:01.128
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1152,7 -1153,7 +1153,7 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 1f2e1b0c64934ec80f09d596d512f7c320e36f81
- R 49abc8d6d7ef4006e5cb557bcc20c7b2
 -P f5ad1e1bf2828c5da70c1ff944d8212036142e6f
 -R 07c665af95e97929880dcb47f3f495f9
 -U drh
 -Z 585a1fb26982d5587e4e3f114773e866
++P 8ef97420b2614f50de6e6d7c758483b8b888f325 0a8bcbbd4e11a60923736b2be9b1ce83ea2263fb
++R 49c6d16c122de920ce19e3016ce96465
 +U dan
- Z 6ee8c9c2c8d267732a52bf0bb533fbfa
++Z b1935a89c2fa8977f31cb64f1fee4e2a
diff --cc manifest.uuid
index a2b1e528e931ef42fedf3d2d3e3ee5fea4d0bfd0,a4c42c8f7f3d962e8f9044cc6ee882889424743e..bf4a1bedd4685410a41e7f4ccb2812df4b4615c7
@@@ -1,1 -1,1 +1,1 @@@
- 8ef97420b2614f50de6e6d7c758483b8b888f325
 -0a8bcbbd4e11a60923736b2be9b1ce83ea2263fb
++4d7057c4942464b4302031a1ee9f195700c5e66d