From: dan <dan@noemail.net>
Date: Fri, 26 Nov 2010 15:17:12 +0000 (+0000)
Subject: Merge fts3 matchinfo() changes with trunk.
X-Git-Tag: version-3.7.4~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=609be6c9123b73f0b2c3464bb05193ea27041473;p=thirdparty%2Fsqlite.git

Merge fts3 matchinfo() changes with trunk.

FossilOrigin-Name: 7d660b91b748126c499285713bd0237530a1a601
---

609be6c9123b73f0b2c3464bb05193ea27041473
diff --cc manifest
index 1f0ed38e49,d2dc0e62e3..926d333aa3
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Fix\sa\scouple\sof\scompiler\swarnings\sin\stest_superlock.c.\s\sAdd\ssuperlock.c\nto\sthe\sMakefile.in\sused\sby\sthe\sconfigure\sscript.
- D 2010-11-24T13:04:22
 -C Add\sa\scouple\sof\scomments\sto\sfts3_snippet.c.
 -D 2010-11-26T15:13:32
++C Merge\sfts3\smatchinfo()\schanges\swith\strunk.
++D 2010-11-26T15:17:13
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -892,14 -889,7 +889,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 1541ae3fbd7b3d471e002c0ad14e7846f7ad9415
- R 23ed169dd1eaa7c16f1bbe2fbe57a18a
- U drh
- Z b29da3037485bdfcaa04aa9867a77538
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFM7Q1ZoxKgR168RlERAkTlAJ9pPhSfkPTLg/Rq/zg1H6kQDC/rjQCggZ30
- DP3n4Bo1JUANTa9Pez3/EXc=
- =OzBi
- -----END PGP SIGNATURE-----
 -P 515cb3f4e5282551d300ba79c8885b8ca016a408
++P 461f1a010f55e7da6b43ea65550066b1ca7abad0 ad8df6c5ee0055cf1161a3b700d69dbe07d969bc
+ R 2c5f31c8d333c565e4e278772ba9f1b5
+ U dan
 -Z cd104d5839634fc3855fe1622f7c9862
++Z ccfce84e75ba63e1edaa17daabaf1c82
diff --cc manifest.uuid
index 95dc69ba83,0956fdec37..a3d497e4f9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 461f1a010f55e7da6b43ea65550066b1ca7abad0
 -ad8df6c5ee0055cf1161a3b700d69dbe07d969bc
++7d660b91b748126c499285713bd0237530a1a601