From: dan <dan@noemail.net>
Date: Sat, 24 Apr 2010 04:53:15 +0000 (+0000)
Subject: Merge with [e79dac3c2f].
X-Git-Tag: version-3.7.2~455^2~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f08d4b848136d5ec8e486b409e1ea8398f088f1;p=thirdparty%2Fsqlite.git

Merge with [e79dac3c2f].

FossilOrigin-Name: 1e793d3a6d46ec5d744e077b10362e7cfa118eef
---

4f08d4b848136d5ec8e486b409e1ea8398f088f1
diff --cc manifest
index ffb0444ea2,b2b5616710..75fb38c6d7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Reserve\ssome\sspace\sat\sthe\sstart\sof\sthe\slog-summary\sfile\sto\sapply\slocks\sto.
- D 2010-04-24T04:49:15
 -C Merge\sof\snotify.c\schanges\sfrom\sexperimental.\s\s\nReset\sstored\sblocking\sconnection\swhen\sregistered\sunlock_notify\scallback\sis\scleared.
 -D 2010-04-23T14:29:04
++C Merge\swith\s[e79dac3c2f].
++D 2010-04-24T04:53:16
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -808,7 -798,7 +808,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 480d12db4c0ebcc37598f7620d39193875eab15b
- R f27ff96a8474356c5e71b7eed104ff79
 -P 3e646e3f4cd0ca288e444561e951cecfdaee2ab5 95ff76ef67d6189f54375973fa485d6eb464b029
 -R 7c539ea1b6c4af52a0f9e1df86aac19e
 -U shaneh
 -Z bd2044fda76be379d81bb4e3c420d2ab
++P a031aa1fa01f062b087154833738f011f7bc4eb5 e79dac3c2f723ed7cc62fcef468f53952711f242
++R 39ee25bf2853e2a576b8db264ae5f0b2
 +U dan
- Z 9b426b4ef3d6b692bab78cb4477e0b43
++Z 61f7a505aff9cfe44f8682955cde1b74
diff --cc manifest.uuid
index 43145bd9a2,80f48ee222..f06a533fb4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a031aa1fa01f062b087154833738f011f7bc4eb5
 -e79dac3c2f723ed7cc62fcef468f53952711f242
++1e793d3a6d46ec5d744e077b10362e7cfa118eef