simon-git: ipbt (main): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  0817d699 Switch some int variables to bool.
  d4f9e480 Merge from up-to-date PuTTY.

Repository:     https://git.tartarus.org/simon/ipbt.git
On the web:     https://git.tartarus.org/?p=simon/ipbt.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2021-02-10 21:19:40

commit 0817d699bd48d5e76442d9be5cd0847578f44aa8
web diff https://git.tartarus.org/?p=simon/ipbt.git;a=commitdiff;h=0817d699bd48d5e76442d9be5cd0847578f44aa8;hp=fb9781fdf42c56827798581dfa23c8122505ba9d
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Feb 10 20:44:58 2021 +0000

    Switch some int variables to bool.
    
    This is an overdue change in IPBT, and will make it match up-to-date
    PuTTY, which I'm planning to merge next.

 ipbt.c | 105 +++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 53 insertions(+), 52 deletions(-)

commit d4f9e48053ebec9ec5cb9b9d458f08757c9286ba
web diff https://git.tartarus.org/?p=simon/ipbt.git;a=commitdiff;h=d4f9e48053ebec9ec5cb9b9d458f08757c9286ba;hp=0817d699bd48d5e76442d9be5cd0847578f44aa8
Merge: 0817d699 6bf3b494
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Feb 10 21:12:28 2021 +0000

    Merge from up-to-date PuTTY.
    
    IPBT and PuTTY have diverged somewhat. This merge commit was
    constructed by attempting the merge in the obvious way, removing all
    files that the PuTTY side updated or renamed that the IPBT side had
    deleted, and reverting files that are deliberately totally different
    on the IPBT side:
    
      git fetch $MYGIT/putty.git main
      git merge --no-commit FETCH_HEAD
      git rm -f $(git status -s | grep -E '^(DU|UA|A ) ' | cut -c4-)
      git checkout HEAD -- .gitignore Buildscr README configure.ac
    
    and then manually fixing the remaining merge conflicts, both textual
    and semantic (e.g. updating ipbt.c to use the new TermWin
    abstraction), and adding back in a few new source files actually
    needed by the IPBT build.