From: dan <dan@noemail.net>
Date: Fri, 24 Sep 2010 18:08:01 +0000 (+0000)
Subject: Merge experimental branch back into trunk.
X-Git-Tag: version-3.7.4~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52c3dcd39741e05c4e9bb8ccbd19c68e0f69b27b;p=thirdparty%2Fsqlite.git

Merge experimental branch back into trunk.

FossilOrigin-Name: 83ecec5d158c48e2fb93b0111ade62f039613540
---

52c3dcd39741e05c4e9bb8ccbd19c68e0f69b27b
diff --cc manifest
index 490b12707a,61bfe5d1b7..437703d227
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Modify\stestable\sstatement\sids\sin\sa\sfew\stest\sfiles\sto\saccount\sfor\srecent\sdocsrc\schanges.
- D 2010-09-24T08:00:11
 -C Add\snew\sfile\se_vacuum.test.\sMove\spart\sof\se_select.test\sinto\se_select2.test.
 -D 2010-09-24T18:04:23
++C Merge\sexperimental\sbranch\sback\sinto\strunk.
++D 2010-09-24T18:08:01
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -863,7 -865,7 +865,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P fab3b383bb2c4764a56811f22ff4c783441918e8
- R 4683e99a104ba4aaae84fe720a6691d9
 -P c1ebcacd9b31239aee065c64c4b4596d56dc397f
++P 7893e525953da6c97eaea23fe94d26e1e635edea 30801892c6036b8de2e26fc178389479c04b5dfa
+ R 631f8b37be3b55d6915c731a8852c03e
  U dan
- Z 37fa86056d8a38c1bc8ef7e03a743aec
 -Z 644ec5e80803b65e2fb74d5134b3243e
++Z c1f62caf19e416ab49a800f20cab5087
diff --cc manifest.uuid
index c1ec2a97f9,ad849dab77..47d0fc9b12
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7893e525953da6c97eaea23fe94d26e1e635edea
 -30801892c6036b8de2e26fc178389479c04b5dfa
++83ecec5d158c48e2fb93b0111ade62f039613540