From: dan <dan@noemail.net>
Date: Tue, 28 May 2013 10:52:22 +0000 (+0000)
Subject: Merge autoconf-package branch with trunk.
X-Git-Tag: version-3.8.0~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7ac8c0f1fe7e57702036aae7553fb5970bb664c;p=thirdparty%2Fsqlite.git

Merge autoconf-package branch with trunk.

FossilOrigin-Name: a72f50ef76a5f8a3d5a6a758ec88009c12127f06
---

c7ac8c0f1fe7e57702036aae7553fb5970bb664c
diff --cc manifest
index 29a52f2578,1107994056..c40ccc25bc
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C When\swriting\sto\san\sFTS\stable,\stake\san\sexclusive\sshared-cache\slock\son\sthe\s%_segdir\stable\sbefore\swriting.\sOtherwise,\san\sxCommit()\scall\smay\sreport\san\sSQLITE_LOCKED\serror.
- D 2013-05-27T10:11:53.308
 -C Add\sthe\s"dist"\starget\sto\smain.mk.\sFor\sbuilding\sthe\samalgamation\sautoconf\spackage.
 -D 2013-05-27T18:37:33.110
++C Merge\sautoconf-package\sbranch\swith\strunk.
++D 2013-05-28T10:52:22.037
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f6b58b7bdf6535f0f0620c486dd59aa4662c0b4f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1066,7 -1090,7 +1090,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 61a10452399db28cd5ea4ba9d416b87a34c2eddb
- R 5b2b7d523083ab3d77d86c0cce4d267d
 -P 048865e8fdd2bef6b43b6cebd45fae94c8a1ab20
++P 3cd2da42e9403b1e6243ad53f3f2bbf89c0fb9b0 3fdc8b56493350fc4854fb1eaefe29ac87784f91
+ R 5f01d70f556992e077a0b0dc7f686941
  U dan
- Z 5b590f475035536f2f371b845c79a1e4
 -Z a0aa8f1a377f5d4aff1fe20419c0f786
++Z 9cf41dafa5dbcb69eb0f753e10b8143c
diff --cc manifest.uuid
index cd1334fa37,1235935ef2..97a88a6194
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3cd2da42e9403b1e6243ad53f3f2bbf89c0fb9b0
 -3fdc8b56493350fc4854fb1eaefe29ac87784f91
++a72f50ef76a5f8a3d5a6a758ec88009c12127f06