From: dan <dan@noemail.net>
Date: Tue, 5 Mar 2013 16:54:45 +0000 (+0000)
Subject: Merge experimental branch with trunk.
X-Git-Tag: version-3.7.16~14^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77dfe91662d194c436323fd221ec0133109fe715;p=thirdparty%2Fsqlite.git

Merge experimental branch with trunk.

FossilOrigin-Name: 4e6e07a60e543d5d1727cde27ab11e156202a1b8
---

77dfe91662d194c436323fd221ec0133109fe715
diff --cc manifest
index 871ea51352,d0c6ed2126..4b5b831042
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sbug\sin\sthe\srecent\sincremental-vacuum\srelated\schanges.
- D 2013-03-05T11:27:04.053
 -C Do\snot\sattempt\sto\sset\sthe\spermissions\son\san\sexisting\sjournal\sor\swal\sfile.\sDo\sthis\sonly\simmediately\safter\screating\sa\snew\sfile\s(or\sopening\sone\szero\sbytes\sin\ssize).
 -D 2013-03-05T15:27:34.350
++C Merge\sexperimental\sbranch\swith\strunk.
++D 2013-03-05T16:54:45.725
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1036,7 -1036,7 +1036,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 8e0ced1af78d8c25a06423a8e7e337ac845155cc
- R d0fc02cfce5e41e4c1a5be120b4b33d4
 -P 39247b14a52b0c0222fe5a848bf0aef0854058c4
++P 717863fca6d58828bf9321bc8b169e385ad4263f 1d8086902ee96347491bce5ec04dc92ccd42efa1
+ R cdff7116ca1269af949fd381129331e4
  U dan
- Z c4b64c03342d1e7d5813b1d9185813bd
 -Z 72d9794671122cfd955b2358dcd76229
++Z 096a27b1e7348ccd7fb11b376ce2d88a
diff --cc manifest.uuid
index 95a5e3503e,d22a7b5ed1..7f87da50b6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 717863fca6d58828bf9321bc8b169e385ad4263f
 -1d8086902ee96347491bce5ec04dc92ccd42efa1
++4e6e07a60e543d5d1727cde27ab11e156202a1b8