[Chinese-commits] [fqterm] 29/34: Merge branch 'upstream'

[Boyuan Yang]

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository fqterm.

commit 8f12eb213fcfdc21324215c47e01a405f3bb0677
Merge: 94be87b f1e3739
Author: Boyuan Yang <073plan at gmail.com>
Date:   Sat Oct 29 15:11:52 2016 +0800

    Merge branch 'upstream'

 CMakeLists.txt                              | 101 ++++---
 CMakeLists.txt.freebsd                      |  18 +-
 CMakeLists.txt.linux                        |  66 ++--
 CMakeLists.txt.macos                        |  21 +-
 CMakeLists.txt.mingw                        |  28 +-
 CMakeLists.txt.win32                        |  24 +-
 README.md                                   |  39 +--
 doc/SSH.md                                  |   9 +
 res/fqterm.desktop                          |   2 +-
 res/fqterm.sh                               |  10 +-
 res/pic/log_raw.png                         | Bin 0 -> 931 bytes
 res/script/smth_board_stat.js               | 138 +++++++++
 res/userconf/fqterm.cfg.orig                |   2 +
 src/CMakeLists.txt                          |   6 -
 src/common/CMakeLists.txt                   |  27 +-
 src/common/fqterm_param.cpp                 |   1 +
 src/common/fqterm_param.h                   |   1 +
 src/common/fqterm_shortcuthelper.cpp        |   9 +-
 src/common/fqterm_shortcuthelper.h          |   1 +
 src/fqterm/CMakeLists.txt                   |  45 ++-
 src/fqterm/fqterm_frame.cpp                 |  25 ++
 src/fqterm/fqterm_frame.h                   |   1 +
 src/fqterm/main.cpp                         |   4 -
 src/protocol/CMakeLists.txt                 |  20 +-
 src/protocol/internal/fqterm_ssh2_kex.cpp   |  21 +-
 src/protocol/internal/fqterm_ssh2_kex.h     |   4 +-
 src/protocol/internal/fqterm_ssh_buffer.cpp |   2 +-
 src/protocol/internal/fqterm_ssh_des.cpp    |   6 +-
 src/protocol/internal/fqterm_ssh_kex.cpp    |  54 ++--
 src/protocol/internal/fqterm_ssh_kex.h      |   6 +-
 src/protocol/internal/ssh_pubkey_crypto.c   |  76 +++++
 src/protocol/internal/ssh_pubkey_crypto.h   |  47 +++
 src/terminal/CMakeLists.txt                 |  15 +-
 src/terminal/fqterm_session.cpp             |  46 +++
 src/terminal/fqterm_session.h               |  10 +-
 src/ui/CMakeLists.txt                       |  33 +-
 src/ui/imageviewer/CMakeLists.txt           |  36 +++
 src/ui/{ => imageviewer}/fqterm_canvas.cpp  |   0
 src/ui/{ => imageviewer}/fqterm_canvas.h    |   0
 src/ui/imageviewer/fqtermimage.cpp          |   9 +
 src/ui/imageviewer/fqtermimage.h            |  22 ++
 src/ui/{ => imageviewer}/imageviewer.cpp    | 414 -------------------------
 src/ui/{ => imageviewer}/imageviewer.h      | 160 +++-------
 src/ui/imageviewer/imageviewer_origin.cpp   | 454 ++++++++++++++++++++++++++++
 src/ui/imageviewer/imageviewer_origin.h     | 108 +++++++
 src/ui/{ => imageviewer}/pictureflow.cpp    |   0
 src/ui/{ => imageviewer}/pictureflow.h      |   0
 src/unite/CMakeLists.txt                    |  27 +-
 src/utilities/CMakeLists.txt                |  16 +-
 src/utilities/fqterm_http.cpp               |  17 +-
 50 files changed, 1374 insertions(+), 807 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git