From ad65aa9931a72702f08c6c44e9f977122ee236e3 Mon Sep 17 00:00:00 2001 From: mintty Date: Fri, 15 Mar 2019 00:50:56 +0100 Subject: [PATCH] 1.9.7 --- LICENSE.mintty | 2 ++ VERSION | 2 +- config-distros.sh | 2 +- makefile | 6 +++--- mkshortcut.vbs | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/LICENSE.mintty b/LICENSE.mintty index a152e63..47124bf 100644 --- a/LICENSE.mintty +++ b/LICENSE.mintty @@ -17,6 +17,8 @@ See LICENSE.PuTTY for PuTTY's copyright notice, contributors, and license. The sources of PuTTY 0.60 can be downloaded from ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-0.60. +The minibidi algorithm is under MIT license as quoted in the source file. + Sixel code (sixel.c) is relicensed under GPL like mintty with the permission of its author (kmiya@culti); Sixel colour conversion code (sixel_hls.c) is licensed by its author Ross Combs under the license diff --git a/VERSION b/VERSION index 7bc1c40..fee0a27 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9.6 +1.9.7 diff --git a/config-distros.sh b/config-distros.sh index fa38946..5423769 100755 --- a/config-distros.sh +++ b/config-distros.sh @@ -167,7 +167,7 @@ do echoc "- icon $icon" echoc "- root $root" target="$installdir"'\bin\mintty.exe' - bridgeargs="" # deprecated + bridgeargs=" " # deprecated if $ok && $config then diff --git a/makefile b/makefile index 373706f..9aa7544 100644 --- a/makefile +++ b/makefile @@ -8,10 +8,10 @@ # wsltty release -ver=1.9.6 +ver=1.9.7 # wsltty appx release - must have 4 parts! -verx=1.9.6.0 +verx=1.9.7.0 # Windows SDK version for appx WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack @@ -19,7 +19,7 @@ WINSDKVER=`regtool list '$(WINSDKKEY)' | sed -e '$$ q' -e d` ############################## # mintty release version -minttyver=2.9.6 +minttyver=2.9.7 # or mintty branch or commit version #minttyver=master diff --git a/mkshortcut.vbs b/mkshortcut.vbs index 9e0bf92..6fcf59f 100755 --- a/mkshortcut.vbs +++ b/mkshortcut.vbs @@ -24,7 +24,7 @@ rem lnk.Arguments = Wscript.Arguments.Named("arguments") lnk.TargetPath = wshell.ExpandEnvironmentStrings("%target%") minttyargs = wshell.ExpandEnvironmentStrings("%minttyargs%") bridgeargs = wshell.ExpandEnvironmentStrings("%bridgeargs%") -lnk.Arguments = minttyargs & bridgeargs +lnk.Arguments = minttyargs & " " & bridgeargs rem wscript.echo "minttyargs: " & minttyargs rem wscript.echo lnk.Arguments