From: dan <dan@noemail.net>
Date: Fri, 23 Jul 2010 17:37:13 +0000 (+0000)
Subject: Merge two leaves.
X-Git-Tag: version-3.7.2~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8747eff5a8cf135ff780c9a43c79cff54a07aaa;p=thirdparty%2Fsqlite.git

Merge two leaves.

FossilOrigin-Name: 54e5886d841af69c8fa965bbcd637441d4a398ba
---

d8747eff5a8cf135ff780c9a43c79cff54a07aaa
diff --cc manifest
index 28e0ec8f20,c833bde9b8..fcbc3f56a8
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Strenghten\san\sassert()\sin\smalloc.c\sthat\shelps\sto\sensure\sthat\sallocated\smemory\nis\sfreed\sby\sthe\sappropriate\sroutine.
- D 2010-07-23T17:32:23
 -C Add\sa\stest\scase\sto\sshared.test.\sNo\schanges\sto\sproduction\scode.
 -D 2010-07-23T15:55:32
++C Merge\stwo\sleaves.
++D 2010-07-23T17:37:13
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -841,14 -838,7 +838,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 5c58f44aeb224e106497368d9290d75a08807761
- R 0737b55c191f07ae1ad4fa3bf1f755c1
- U drh
- Z 0a76b0c40d2f418cd9847132220ce5bf
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFMSdIwoxKgR168RlERApNcAJ410iFTmSjiaKEwT7N0SDbHgajjxQCfanYz
- ZoDT+tmH93pc0A6pOi4UbwA=
- =eycw
- -----END PGP SIGNATURE-----
 -P 6eddc6e601cf8f585c6c2cf79f36fcbfe98a307e
 -R 78a69c10590c609851ce8c464e2ad62c
++P 80db61acca034a8edff0fd23a65a0bbc9206a7b3 bfb0dd3c2f7e1ffbdf236be4adc3e0d804ed5854
++R f64674fd73e928c91a12f4bbf3d016fe
+ U dan
 -Z 6d496f6480db51a71cd50a034edef5d6
++Z 1404b8cebd331e440d4f17d98e1c840f
diff --cc manifest.uuid
index 39f859e5ab,35d8459647..4f9a4656be
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 80db61acca034a8edff0fd23a65a0bbc9206a7b3
 -bfb0dd3c2f7e1ffbdf236be4adc3e0d804ed5854
++54e5886d841af69c8fa965bbcd637441d4a398ba