From: mistachkin <mistachkin@noemail.net>
Date: Tue, 6 May 2014 21:30:25 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.5~42^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f574259a64b2b1d629406080bc1aa103c4d3219d;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 7579c44ac1865133c37b16f2acc074d1eed4fdfd
---

f574259a64b2b1d629406080bc1aa103c4d3219d
diff --cc manifest
index eb814f0314,5cc3df3b6b..53adfd7ce9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Refactor\sVSIX\spackage\screation\stool\sto\sbetter\ssupport\sVisual\sStudio\s2013.
- D 2014-05-06T00:09:46.488
 -C Enhance\sthe\sVSIX\spackage\screation\stool\sto\sbetter\ssupport\sVisual\sStudio\s2013.
 -D 2014-05-06T21:26:34.436
++C Merge\supdates\sfrom\strunk.
++D 2014-05-06T21:30:25.036
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1140,7 -1140,7 +1140,7 @@@ F tool/mksqlite3c-noext.tcl 1712d3d7125
  F tool/mksqlite3c.tcl ba274df71f5e6534b0a913c7c48eabfcbd0934b6
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
- F tool/mkvsix.tcl ee6cf791d22baeac5d488a30bac156e5098fabb9
 -F tool/mkvsix.tcl 924dcdecda86969686833301c08f84cca2600d94
++F tool/mkvsix.tcl 021504dacf6c9a6dda0c3eb9caa684d259feb297
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1167,8 -1167,8 +1167,8 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 -F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
 -P c1ab9092e29bc9d172c1f1a3becbcc83b79f2080
 -R a58107e75319df920bcb764f3109ea62
 +F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
- P 668ed76ac6cfd5810aea7319c752d77fafaab319
- R 5812195e1a7ed7ccc7cd4024eddb3bfc
++P 8be166af239cbdaff3937c4003a6dc6e8a96e53a c1fb04f61eb74d80d1b7607ae6904fe2e1717988
++R b392192acbeb452efb75eebb9d223240
  U mistachkin
- Z add6d3433971df64a412a72ae0f72bd9
 -Z 469c7a319e5e989d73df4c062d995fca
++Z 39d35e31175990b3b740ccac33ccbea0
diff --cc manifest.uuid
index 8b91267341,4bcb53df54..775af7dece
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8be166af239cbdaff3937c4003a6dc6e8a96e53a
 -c1fb04f61eb74d80d1b7607ae6904fe2e1717988
++7579c44ac1865133c37b16f2acc074d1eed4fdfd
diff --cc tool/mkvsix.tcl
index feb1bcefd9,712cf32278..51ebe4ddb7
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@@ -65,16 -65,15 +65,16 @@@
  # argument is optional and if present must contain the name of the directory
  # containing the root of the source tree for SQLite.  The third argument is
  # optional and if present must contain the flavor the VSIX package to build.
- # Currently, the only supported package flavors are "WinRT", "WinRT81", and
- # "WP80", "WP81", and "Win32".  The fourth argument is optional and if present
- # must be a string containing a list of platforms to include in the VSIX
- # package.  The platform list is "platform1,platform2,platform3".  The fifth
- # argument is optional and if present must contain the version of Visual Studio
- # required by the package.  Currently, the only supported versions are "2012"
- # and "2013".  The package flavors "WinRT81" and "WP81" are only supported when
- # the Visual Studio version is "2013".  Typically, when on Windows, this script
- # is executed using commands similar to the following from a normal Windows
+ # Currently, the only supported package flavors are "WinRT", "WinRT81", "WP80",
 -# and "Win32".  The fourth argument is optional and if present must be a string
 -# containing a list of platforms to include in the VSIX package.  The platform
 -# list is "platform1,platform2,platform3".  The fifth argument is optional and
 -# if present must contain the version of Visual Studio required by the package.
 -# Currently, the only supported versions are "2012" and "2013".  The package
 -# flavor "WinRT81" is only supported when the Visual Studio version is "2013".
 -# Typically, when on Windows, this script is executed using commands similar to
 -# the following from a normal Windows command prompt:
++# "WP81", and "Win32".  The fourth argument is optional and if present must be
++# a string containing a list of platforms to include in the VSIX package.  The
++# platform list is "platform1,platform2,platform3".  The fifth argument is
++# optional and if present must contain the version of Visual Studio required by
++# the package.  Currently, the only supported versions are "2012" and "2013".
++# The package flavors "WinRT81" and "WP81" are only supported when the Visual
++# Studio version is "2013".  Typically, when on Windows, this script is
++# executed using commands similar to the following from a normal Windows
 +# command prompt:
  #
  #                         CD /D C:\dev\sqlite\core
  #                         tclsh85 tool\mkvsix.tcl C:\Temp