From: shaneh <shaneh@noemail.net>
Date: Fri, 6 Nov 2009 03:33:01 +0000 (+0000)
Subject: Merged accidental fork.
X-Git-Tag: fts3-refactor~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6278666fe346998f630933c690fe2f357d1f2da8;p=thirdparty%2Fsqlite.git

Merged accidental fork.

FossilOrigin-Name: d410cd4e42ecf50a849f49cf3395ec169350e7cf
---

6278666fe346998f630933c690fe2f357d1f2da8
diff --cc manifest
index a8884377f8,cf04987808..a3975d4860
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Recover\san\sophaned\sbranch\sthat\sresulted\sfrom\ssome\sill-advised\s"shunning".\nThis\scheck-in\sshould\sbe\sidentical\sto\s[bd443f39a9]\sexcept\sthat\sit\sshould\nbe\son\sthe\strunk.
- D 2009-11-05T18:46:03
 -C Add\ssome\svery\sbasic\stests\sfor\sthe\scommands\savailable\sfrom\sthe\sCLI.
 -D 2009-11-06T03:22:55
++C Merged\saccidental\sfork.
++D 2009-11-06T03:33:02
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a77dfde96ad86aafd3f71651a4333a104debe86a
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -764,14 -762,10 +762,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
--P eb7a544fe49d1626bacecfe53ddc03fe082e3243
- R c637d844ce67664e51752e29538bdaf8
- U drh
- Z 8f4c0080b7919755fbda5ad097f0669b
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFK8x1uoxKgR168RlERAuoNAJ9GWKls+NAdOdJELmZAftlGi0dLXgCeMJzv
- wVD4wzQxZqdtkqp/9IhpEQI=
- =DLAB
- -----END PGP SIGNATURE-----
 -R fae9bb1bfda84b08471983345efa3e3e
 -T *branch * trunk
 -T *sym-trunk *
 -T -sym-release *
++P 38eaf1ab6e05161e6dc7cd69e942aeca16548c45 6bf43338049f956b447139c90df472682e28222a
++R 04091970e2e76e3a20b2d6d4a8f9a97a
+ U shaneh
 -Z 22d0b71b08c4b8d13c9518094d3a312f
++Z 124f978c5a8d21bfc62ab6af1f53f175
diff --cc manifest.uuid
index f55e9739a9,2dd58347fb..ac39c2279c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 38eaf1ab6e05161e6dc7cd69e942aeca16548c45
 -6bf43338049f956b447139c90df472682e28222a
++d410cd4e42ecf50a849f49cf3395ec169350e7cf