From: mistachkin <mistachkin@noemail.net>
Date: Tue, 26 Nov 2013 00:33:25 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.5~56^2~1^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9598ae2c11591b356fe114d049febd541146b3e8;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: c5ab4378756965b0c2ab218e5ec59c40898b89ea
---

9598ae2c11591b356fe114d049febd541146b3e8
diff --cc manifest
index e8fa1b9203,62e099e034..3f9a102e7b
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Correct\sline-endings\sin\sthe\snew\sheader\sfile.
- D 2013-11-25T09:37:24.023
 -C Better\ssupport\sfor\sUTF-8\spaths\son\sCygwin.
 -D 2013-11-26T00:28:50.946
++C Merge\supdates\sfrom\strunk.
++D 2013-11-26T00:33:25.374
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 +F Makefile.in 16254fb023b7e69788013f0da5ccdc2063ba2328
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc a6247094079f3ef97dcd7a69d0e13ff718c7073e
 -F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 +F Makefile.msc 7e91dccedae82c45dbf91a4e8240c642c2b90c83
 +F Makefile.vxworks f921bd6a0600e36d67da080d820ae712ab393f30
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 52f7e22bfcec71a462e34194b4ae1671380fde59
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -200,14 -200,13 +200,14 @@@ F src/mutex.c d3b66a569368015e0fcb1ac15
  F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
 -F src/mutex_w32.c 6108c88e1cb38d8fbb3534b170793815cbedbf97
 +F src/mutex_w32.c ab08c0fc54b71979370ca7c8f42fc64a9f211ebb
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
  F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 -F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 +F src/os.h cd8fd6545d6a936bae05026136324ec8e620c7f8
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c 143624d9eabb3b997c59cf594e0d06c56edd43e9
- F src/os_win.c 423d8f815067f4980cb84abab501374afc9bd039
 -F src/os_win.c cb3f26205ea785a63ea5bdc21a9c9f9ae3972d0f
++F src/os_win.c 99a5668c207bee7fae238209a3043c03b6050056
 +F src/os_win.h ac253253d080dc3dd261efe5e98626c4b95e5a26
  F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
  F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
  F src/parse.y acee1a9958539e21263362b194594c5255ad2fca
@@@ -1143,7 -1143,7 +1144,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 0d42c6b830ee50f45539d73e3948ed3bc50a11d1
- R 0e6472b71f09f9a7891e918b85232304
 -P 914e6c9d88828b66e8385c4a264702471faa34cf 484162b6e5a8ad9385fe2eb2a5254d13d7b0bc36
 -R 1b8f9bd2dcb67783ed3f85d3422a2824
++P 94219b9f1ff59ea408c7ded167ee28b00c0f38c1 9954327c0febc0ece46f62e05976330a1b82b48f
++R 8ba15fb22b38fc61c6334c03ecc16c63
  U mistachkin
- Z c441f2886dac757b12ddb73cf4ef6f57
 -Z f0ab176076e12054e72ef7c2fe54ec51
++Z a3a638752bfaa9f69bc41b7e3e5dbf34
diff --cc manifest.uuid
index 910f42306d,b5dd746957..b8c2a58092
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 94219b9f1ff59ea408c7ded167ee28b00c0f38c1
 -9954327c0febc0ece46f62e05976330a1b82b48f
++c5ab4378756965b0c2ab218e5ec59c40898b89ea