From: dan <dan@noemail.net>
Date: Wed, 7 Jul 2010 16:23:36 +0000 (+0000)
Subject: Merge together another accidental fork.
X-Git-Tag: version-3.7.2~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fb66141ede604a5b48b52f30c798775a29a82e1;p=thirdparty%2Fsqlite.git

Merge together another accidental fork.

FossilOrigin-Name: c41f04edb20c0c8fc8c49a53d42cc0b8a0ff7fe3
---

8fb66141ede604a5b48b52f30c798775a29a82e1
diff --cc manifest
index a8e955f6d4,dc508d1c99..65dbe34b7a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Do\snot\smake\sthe\sSQLITE_FCNTL_SIZE_HINT\scall\sif\san\serror\shas\salready\soccurred\sduring\stransaction\scommit.
- D 2010-07-07T16:18:46
 -C Fix\stest\snumbering\sissue\sin\snan.test.
 -D 2010-07-07T16:20:39
++C Merge\stogether\sanother\saccidental\sfork.
++D 2010-07-07T16:23:37
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -831,7 -831,7 +831,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
--P f4076d8567243174c023b7aa7ae9ca7f8f73e33b
- R 423d72eb770aafb7bbf6d0a682f0a1aa
 -R c970a5b5dd2be1e9ca492d8af03b80ee
 -U shaneh
 -Z d43b52294ca0a4f0a3b462dde9f23d6e
++P e92de834a39be07da5f0848d7ec5f1f6dff902a5 5bb1330fef559d47dc854089dedba45bf05db192
++R 2cb3265b9192594b862fd2ad29948911
 +U dan
- Z 166f981bc5447a4f377705e8e4c03a3f
++Z 8482fc13a7988de5df49ec0e46a26968
diff --cc manifest.uuid
index 6847d83441,c754d78891..6beb271b25
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e92de834a39be07da5f0848d7ec5f1f6dff902a5
 -5bb1330fef559d47dc854089dedba45bf05db192
++c41f04edb20c0c8fc8c49a53d42cc0b8a0ff7fe3