From: shane <shane@noemail.net>
Date: Wed, 21 Oct 2009 14:33:03 +0000 (+0000)
Subject: Merge accidental fork back to trunk.
X-Git-Tag: fts3-refactor~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a91c66e9c0e3b47001dd8e4a86c135c27feb093;p=thirdparty%2Fsqlite.git

Merge accidental fork back to trunk.

FossilOrigin-Name: f63397ad6c32f575fe33b2f7dd22380cd1f51f1d
---

9a91c66e9c0e3b47001dd8e4a86c135c27feb093
diff --cc manifest
index 3277e39692,990281217c..5ca757feff
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Modified\sshell\sto\scall\soutput_html_string()\sfor\sheader\svalues\sin\s.mode\shtml.\nUpdated\soutput_html_string()\sto\ssupport\sthe\s5\sbasic\sHTML\sentities\s(<,>,&,',").\nTicket\s[dc3a6e5b31].
- D 2009-10-21T14:11:49
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Add\sevidence\smarks\sto\sparse.y.\s\sFix\sa\sbroken\sevidence\slink\sin\se_fkey.tcl.
 -D 2009-10-21T13:48:24
++C Merge\saccidental\sfork\sback\sto\strunk.
++D 2009-10-21T14:33:04
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -761,7 -764,14 +761,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P c6f22f3e38018246a2add1a509aa6c5c55b7e0be
- R c9cac35396ade96c4c2aae2d1ecbde46
 -P 8a8eeb0c5af4bbeafd9864b03557eb9cd32f09ce
 -R f28ab011c783a0bbe1723b99fcf4f0b8
 -U drh
 -Z 9f27ced07b6d05f64ef2d5a79854c829
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFK3xEuoxKgR168RlERAgKaAJsENtQsG9JO7w9NQCYLcjXua2PLLgCfasM8
 -Ngo9AyNfH1eW6P29i/EdHks=
 -=aV1A
 ------END PGP SIGNATURE-----
++P c8815fcd88d17b2864e689c84eb8a63ef242ff04 0441d28e84af20e3a98a07a43471784ac09c78db
++R 6eeacdacb7f726e58cd0f945014915a5
 +U shane
- Z bee4e4d5e09912cf13ef82493f9c4b10
++Z af52b342b12ae0c95c670ce88ebf9992
diff --cc manifest.uuid
index 8bc38aadfb,f8cd8cb86c..9d2377940a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c8815fcd88d17b2864e689c84eb8a63ef242ff04
 -0441d28e84af20e3a98a07a43471784ac09c78db
++f63397ad6c32f575fe33b2f7dd22380cd1f51f1d