From: dan <dan@noemail.net>
Date: Sat, 19 Mar 2016 15:34:42 +0000 (+0000)
Subject: Merge latest trunk changes, including fixes to test script rbudiff.test, into this... 
X-Git-Tag: version-3.12.0~34^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f11737fcc86ed0044f6f4f6883266cf362071407;p=thirdparty%2Fsqlite.git

Merge latest trunk changes, including fixes to test script rbudiff.test, into this branch.

FossilOrigin-Name: 734fc68fb12f06e97026d4637138b82b37809f5b
---

f11737fcc86ed0044f6f4f6883266cf362071407
diff --cc manifest
index ec9f64957f,9053c93d5a..c781c627e1
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sfurther\stests\sfor\ssqlite3rbu_bp_progress().\sFix\sa\sproblem\sin\shandling\sWITHOUT\sROWID\stables\sin\sthe\ssame.
- D 2016-03-18T20:12:28.661
 -C Fix\sanother\sproblem\sin\stest\sscript\srbudiff.test.
 -D 2016-03-19T15:13:59.043
++C Merge\slatest\strunk\schanges,\sincluding\sfixes\sto\stest\sscript\srbudiff.test,\sinto\sthis\sbranch.
++D 2016-03-19T15:34:42.291
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -1457,7 -1456,7 +1457,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 1a1b69e87eb7d18f76f5b733e44da75136a686b6
- R 4f2c92bc8e3f772f06e8b5d5663259fa
 -P 1ffe3cde03f924bb8405a8729c8e1bc01f5b6d3b
 -R b5342d0d86cc431c9e51a0ed18eda8f1
++P 65e02368e2b6cec349ea71af5a456d6783b0d15e 41c29c123ff347db720ed1a541c0b2ffc04670aa
++R 4672da949ef7e2ff98784ed13b0995da
  U dan
- Z bf41c4bf32ca5beb18733d3a05925431
 -Z 45d735e7ccd57967a5a5daaae9ccf4a0
++Z 877e0d37b31de9a8b8cab0dfbc82a372
diff --cc manifest.uuid
index 5b3c08d363,5de6868b9a..5a343a598e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 65e02368e2b6cec349ea71af5a456d6783b0d15e
 -41c29c123ff347db720ed1a541c0b2ffc04670aa
++734fc68fb12f06e97026d4637138b82b37809f5b