From: dan <dan@noemail.net>
Date: Tue, 31 Jan 2017 14:08:04 +0000 (+0000)
Subject: Merge latest trunk with this branch.
X-Git-Tag: version-3.17.0~45^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6abc7a6b37aa9971d35adee2b3b6228f8413fe19;p=thirdparty%2Fsqlite.git

Merge latest trunk with this branch.

FossilOrigin-Name: 4a592abbc555fd3b70979b551b00c2ba631253df
---

6abc7a6b37aa9971d35adee2b3b6228f8413fe19
diff --cc manifest
index c93ba97d64,5c0df4b7d4..9002a741bd
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Experimental\schange\sto\sinvoke\sthe\spreupdate\shook\swhen\sWITHOUT\sROWID\stables\sare\nwritten.
- D 2017-01-30T19:44:53.682
 -C Further\sminor\senhancement\sand\ssize\sreduction\sin\s\nsqlite3ExprAssignVarNumber().
 -D 2017-01-31T12:41:48.800
++C Merge\slatest\strunk\swith\sthis\sbranch.
++D 2017-01-31T14:08:04.338
  F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@@ -1550,10 -1548,7 +1550,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e93d2c49a44af994ff10cc9cc7eafacd5a4f73ab
- R f7cc20c31f0badea537c676e1225b282
- T *branch * preupdate-without-rowid
- T *sym-preupdate-without-rowid *
- T -sym-trunk *
 -P 5987ca1ff94ed3c1666f783bb15b16158aa7e1db
 -R 877cd166cfa1886b85d3c173dceec467
 -U drh
 -Z 12e7b02d2001dbb9bba0a7e780630702
++P 856f8604c59c8fdd9bfb7d86fc0e212f091ab49a eacfdcf25796ea29b5e63499c3d7397498305ad9
++R 42635375f02810f3a6e52a94c33a118e
 +U dan
- Z 812bce2fe1496eddb1cec5705157fb44
++Z 96d004df39a939a256587866759a6659
diff --cc manifest.uuid
index 67552c1672,e94ba71f96..b00b636951
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 856f8604c59c8fdd9bfb7d86fc0e212f091ab49a
 -eacfdcf25796ea29b5e63499c3d7397498305ad9
++4a592abbc555fd3b70979b551b00c2ba631253df