From: dan <dan@noemail.net>
Date: Thu, 19 Aug 2010 15:12:54 +0000 (+0000)
Subject: Merge two leaves.
X-Git-Tag: version-3.7.2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f8da184818cca1c652dfdc35ffffeb43dab790;p=thirdparty%2Fsqlite.git

Merge two leaves.

FossilOrigin-Name: b03091fc3592896fcf1ec563ae9682a8e0a05baa
---

a1f8da184818cca1c652dfdc35ffffeb43dab790
diff --cc manifest
index 8e4f454a0c,4458f1fd84..fc7ea54348
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Modify\sthe\scode\sfor\sreading\shot-journal\sfiles\sso\sthat\sit\scan\shandle\sjournals\sgenerated\sby\sversions\s3.5.7\sand\searlier.
- D 2010-08-19T15:11:34
 -C Fix\stypo\sin\sTCL\sstubs\ssupport\sfor\sconfigure\sin\sMakefile.in
 -D 2010-08-19T14:41:59
++C Merge\stwo\sleaves.
++D 2010-08-19T15:12:55
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
+ F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -845,7 -844,7 +845,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 8804f4989d157707911488781109ce0641c0ad0b
- R 8a8db0863e0d33ddc8ea68f9c11cd0ea
 -P b273891ab05a18b68a76c870ea3be9f1a56c40a9
 -R 66683e869d2c6a14ace18fdefb93d1fa
 -U shaneh
 -Z 136ca2267c4158ad1e857aec68953f6c
++P b9170f2903c480bca2bdc986e98aaeadfdb9ad2b 4c7ad73d22b7e8c90955730c2dbb79ed53cd750b
++R 26a0e08eb568545db964da4fcb9b01de
 +U dan
- Z 9fa359ca155f08d9a7ed0d63491f2a4b
++Z 9d459a63353ebad2047baf5fad1d4c83
diff --cc manifest.uuid
index 8ea764cbed,4006472ce1..923cfcff00
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b9170f2903c480bca2bdc986e98aaeadfdb9ad2b
 -4c7ad73d22b7e8c90955730c2dbb79ed53cd750b
++b03091fc3592896fcf1ec563ae9682a8e0a05baa