From: drh <drh@noemail.net>
Date: Mon, 5 May 2014 20:34:25 +0000 (+0000)
Subject: Incorporate the latest trunk changes so that hopefully now this branch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e04613de9c2225ff81191627885fe44dfc66150;p=thirdparty%2Fsqlite.git

Incorporate the latest trunk changes so that hopefully now this branch
will build on beagleboard.

FossilOrigin-Name: 2647b17d7038dcb5ad94d309520db834f4392f26
---

3e04613de9c2225ff81191627885fe44dfc66150
diff --cc manifest
index 5c2174fb5d,f693fb7396..d301a45f3f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Try\sto\sreduce\sthe\samount\sof\smemory\sused\sto\shold\sthe\sschema\swhen\nPRAGMA\signore_check_constraints\sis\sactive.
- D 2014-05-05T19:57:09.081
 -C Create\snew\sheader\sfile\s"os_setup.h"\sused\sto\sdetect\sthe\soperating\ssystem\nat\scompile-time,\sand\s"os_win.h"\sthat\scontains\swindows-specific\sheader\sin\nformation.
 -D 2014-05-05T20:32:15.817
++C Incorporate\sthe\slatest\strunk\schanges\sso\sthat\shopefully\snow\sthis\sbranch\nwill\sbuild\son\sbeagleboard.
++D 2014-05-05T20:34:25.748
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1168,10 -1168,7 +1168,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 857f2baf9b722e4eb1ac0d50fe03e32d5176185b
- R 69cfb806886499369b394e960a7bda2c
- T *branch * reduce-schema-size
- T *sym-reduce-schema-size *
- T -sym-trunk *
 -P b5a72dfd59fba6a9938ac1afdec06a2e6809fd2d 3ac75725a66730566105ad184a988a8f80f51055
 -R 8d3da72aab741dd9279195207e6c8bd7
++P 35a9f3f1787ed20b72a22cdf86cb8b8b0f4976cc bd92e0f80c1158d810b0d47e38f2fe06ff24bb8c
++R bdbe61e3ac3af99cac3789456fdac635
  U drh
- Z 4e457bba1bbaad4242f130453c9a00dd
 -Z 892b3ce35265d0d6387ad7a7c3c1d88b
++Z 54dfc15052cc67334832336427ed702a
diff --cc manifest.uuid
index 95e024fa9f,feb33def06..2ffc82eb91
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 35a9f3f1787ed20b72a22cdf86cb8b8b0f4976cc
 -bd92e0f80c1158d810b0d47e38f2fe06ff24bb8c
++2647b17d7038dcb5ad94d309520db834f4392f26