mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge updates from trunk.

Browse Source 
FossilOrigin-Name: 7579c44ac1865133c37b16f2acc074d1eed4fdfd
This commit is contained in:
mistachkin 2014-05-06 21:30:25 +00:00
commit f574259a64
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Refactor\sVSIX\spackage\screation\stool\sto\sbetter\ssupport\sVisual\sStudio\s2013.
D 2014-05-06T00:09:46.488
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 @@ F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d
F tool/mksqlite3c.tcl ba274df71f5e6534b0a913c7c48eabfcbd0934b6
F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
F tool/mkvsix.tcl ee6cf791d22baeac5d488a30bac156e5098fabb9
F tool/mkvsix.tcl 021504dacf6c9a6dda0c3eb9caa684d259feb297
F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@ -1168,7 +1168,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
P 668ed76ac6cfd5810aea7319c752d77fafaab319
R 5812195e1a7ed7ccc7cd4024eddb3bfc
P 8be166af239cbdaff3937c4003a6dc6e8a96e53a c1fb04f61eb74d80d1b7607ae6904fe2e1717988
R b392192acbeb452efb75eebb9d223240
U mistachkin
Z add6d3433971df64a412a72ae0f72bd9
Z 39d35e31175990b3b740ccac33ccbea0

2
manifest.uuid
View File

@ -1 +1 @@
8be166af239cbdaff3937c4003a6dc6e8a96e53a
7579c44ac1865133c37b16f2acc074d1eed4fdfd

18
tool/mkvsix.tcl
View File

@ -65,15 +65,15 @@
# 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",
# "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