From: drh <drh@noemail.net>
Date: Tue, 12 Jul 2011 14:38:25 +0000 (+0000)
Subject: Merge the improved anti-virus defenses into the trunk.
X-Git-Tag: version-3.7.8~38^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bb600f5c6f5e681e9bfe9012106cec0601b5589;p=thirdparty%2Fsqlite.git

Merge the improved anti-virus defenses into the trunk.

FossilOrigin-Name: 0207fd9b0c0f6baa3c2cb8ba588ad585507848b3
---

3bb600f5c6f5e681e9bfe9012106cec0601b5589
diff --cc manifest
index e631fa3a74,12792f6e0a..00a73b3bc9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthe\sTCL\scommands\sfor\ssetting\swindows\smanditory\slocks.\nAdd\stest\scases\sfor\smanditory\slock\sdelays\sunder\swindows.
- D 2011-07-11T23:45:44.051
 -C Revise\slogic\sin\swinDelete\sto\scheck\sthe\sfile\sprior\sto\sattempting\sto\sdelete\sit.
 -D 2011-07-12T14:02:47.638
++C Merge\sthe\simproved\santi-virus\sdefenses\sinto\sthe\strunk.
++D 2011-07-12T14:38:25.733
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -952,7 -952,7 +952,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P c20aca06610407c197ea50ea77c2591aacf2252a
- R 4c1b031b9c10734fc2cbb78ed1f104dd
 -P ff0ff75c3559f5bbe29c73204cc8ff1cb80f42cb
++P 03af4c175c6ba303ec0a5be25fd42771e38f7347 36f11acc531a524407e03c797a6a1bcf88bad809
+ R 15ec97d6baeea0684b5deea8be1be88e
 -U mistachkin
 -Z 94bbfee187493f0fa246b9c95f6c61dc
 +U drh
- Z 4f5517f8772eb0c19d9bc59edbaff4cc
++Z 2176be5b1a19aaddd13f35903c55d94b
diff --cc manifest.uuid
index 688cc99f9e,1b53d3ad80..21872bd981
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 03af4c175c6ba303ec0a5be25fd42771e38f7347
 -36f11acc531a524407e03c797a6a1bcf88bad809
++0207fd9b0c0f6baa3c2cb8ba588ad585507848b3