Merge latest trunk changes into this branch.

FossilOrigin-Name: 6f4f707f9c3c29f2437962fd5d7761876cf8e7ed7fdcb9d0ca4fd001fa226597
This commit is contained in:
dan 2018-09-05 17:52:52 +00:00
commit 19950d5bfb
2 changed files with 5 additions and 5 deletions

View File

@ -1,5 +1,5 @@
C Fix\ssome\stest\sscript\serrors.\sAnd\san\sincorrect\sassert()\sin\sfts5.
D 2018-09-05T17:45:17.915
C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
D 2018-09-05T17:52:52.364
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
@ -1762,7 +1762,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 2ec7e50cbc0e7a4308d51be3c9416229b187a6a8abdd982c154edc256cd6da1f
P f804336f083d8d26314bb1ba34cec427675065a67cbe2bf00bb42e40752aeb33 e628713338f6e584a32d5fc3436ddbd9ee8cf88401c321c1ebe7daa1e695c623
R 41880ac914b2711bb962960eaec2ca98
U dan
Z 5d7db0d8762bfd1edeb797d19c90dbc2
Z 12f9217db838b96229534e48a6d1f751

View File

@ -1 +1 @@
f804336f083d8d26314bb1ba34cec427675065a67cbe2bf00bb42e40752aeb33
6f4f707f9c3c29f2437962fd5d7761876cf8e7ed7fdcb9d0ca4fd001fa226597