From: dan <dan@noemail.net>
Date: Mon, 25 Feb 2013 13:31:30 +0000 (+0000)
Subject: Merge the incr-vacuum-opt branch with the trunk.
X-Git-Tag: version-3.7.16~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2874b0e1db874502a8b772bdd20101ffa3847e7;p=thirdparty%2Fsqlite.git

Merge the incr-vacuum-opt branch with the trunk.

FossilOrigin-Name: 26e235b7a4cd4d0dc9725774d70174c4d369cb98
---

f2874b0e1db874502a8b772bdd20101ffa3847e7
diff --cc manifest
index b598aeddd6,f11324d902..c6c0e781f4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C On\sMinix,\sdisable\sthe\s".timer"\scommand\sin\sthe\sshell\sin\sorder\sto\savoid\ncalling\sgetrusage().
- D 2013-02-20T00:54:21.855
 -C Add\stest\sfile\sincrvacuum3.test.\sNo\scode\schanges.
 -D 2013-02-25T12:06:55.032
++C Merge\sthe\sincr-vacuum-opt\sbranch\swith\sthe\strunk.
++D 2013-02-25T13:31:30.464
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1034,7 -1035,7 +1035,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 06bd91305ed6752315c5224be5f89e87cafa6687
- R 14c0fedf89f00b14b7845aeac312ffca
- U drh
- Z 673b617e6189db9a51be1e6b0160e6d4
 -P ac8ca3ecee4d81bf522b330033e5d85638063670
++P 9bd9bd9cab8c804c1a51d472199459176044a633 bf57534188e044fb341315bfc05b7927e66a04e0
+ R 4eb400824b32ad5749b8b0c556f7d2a9
+ U dan
 -Z 4b0cde4b14de44a514d78f31b4dd5809
++Z 245da16ecbcaa5ac23033dda88925107
diff --cc manifest.uuid
index 029dba568e,3341d99e0a..31095e83e3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9bd9bd9cab8c804c1a51d472199459176044a633
 -bf57534188e044fb341315bfc05b7927e66a04e0
++26e235b7a4cd4d0dc9725774d70174c4d369cb98