From: dan <dan@noemail.net>
Date: Tue, 11 Jan 2011 17:40:30 +0000 (+0000)
Subject: Merge accidentally created fork.
X-Git-Tag: version-3.7.5~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da56b15e95ed34893d6c1a56829fffcf10e7c180;p=thirdparty%2Fsqlite.git

Merge accidentally created fork.

FossilOrigin-Name: b7d080b8e850bd262f53f29ba4687a62cf76d4ef
---

da56b15e95ed34893d6c1a56829fffcf10e7c180
diff --cc manifest
index 710a412372,d8de733992..a59d5d3555
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Add\sthe\sSQLITE_FCNTL_SYNC\sfile-control.
- D 2011-01-11T17:39:38
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Change\sthe\spage\ssize\sof\sthe\sdestination\sdatabase\sin\sa\sbackup,\sif\sit\sis\nchangeable,\sprior\sto\sstarting\sthe\sbackup.
 -D 2011-01-11T17:38:03.635
++C Merge\saccidentally\screated\sfork.
++D 2011-01-11T17:40:31
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -895,7 -898,14 +895,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
--P ece7efce2733b4fdd71db385abebbde464ac8f30
- R 8f29fed661ee1ba7528f6d53e5a1b035
 -R 29f54f2120ae55006ec20805de522720
 -U drh
 -Z 2c38d84c8992f6e0694f158dc2a7fcb7
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFNLJV+oxKgR168RlERAi/rAJ4/03yY93qaERvdXQ29IRVWFKS4bACbB68f
 -I9vtcTSZhseoWr42H7VDbvY=
 -=uS6P
 ------END PGP SIGNATURE-----
++P b3f2f465c310a2cfef8731a0dae3453593b68de9 a5e4e0caad788318bc973e2550488a3b83128b8b
++R 6faced81a82ecb4ba54df893c5e6a297
 +U dan
- Z 8ca27a923058f8ea50b31a1627ccbb6c
++Z f0f3daac9da086373a27e5813015c53d
diff --cc manifest.uuid
index 9f79240f99,4e3a718601..a739e42b91
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b3f2f465c310a2cfef8731a0dae3453593b68de9
 -a5e4e0caad788318bc973e2550488a3b83128b8b
++b7d080b8e850bd262f53f29ba4687a62cf76d4ef