GUACAMOLE-169: Merge namespaced directory reshuffle.

Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/3ff83231
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/3ff83231
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/3ff83231

Branch: refs/heads/master
Commit: 3ff83231534908c744e46744670d3060e2f8240c
Parents: 08ce433 3f7ccb6
Author: James Muehlner <[email protected]>
Authored: Tue Feb 28 10:28:45 2017 -0800
Committer: James Muehlner <[email protected]>
Committed: Tue Feb 28 10:28:45 2017 -0800

----------------------------------------------------------------------
 src/common-ssh/Makefile.am                |  24 +-
 src/common-ssh/buffer.c                   | 135 ++++
 src/common-ssh/common-ssh/buffer.h        | 134 ++++
 src/common-ssh/common-ssh/key.h           | 170 +++++
 src/common-ssh/common-ssh/sftp.h          | 242 +++++++
 src/common-ssh/common-ssh/ssh.h           | 114 ++++
 src/common-ssh/common-ssh/user.h          | 108 ++++
 src/common-ssh/guac_sftp.c                | 783 -----------------------
 src/common-ssh/guac_sftp.h                | 242 -------
 src/common-ssh/guac_ssh.c                 | 544 ----------------
 src/common-ssh/guac_ssh.h                 | 114 ----
 src/common-ssh/guac_ssh_buffer.c          | 135 ----
 src/common-ssh/guac_ssh_buffer.h          | 134 ----
 src/common-ssh/guac_ssh_key.c             | 217 -------
 src/common-ssh/guac_ssh_key.h             | 170 -----
 src/common-ssh/guac_ssh_user.c            |  82 ---
 src/common-ssh/guac_ssh_user.h            | 108 ----
 src/common-ssh/key.c                      | 217 +++++++
 src/common-ssh/sftp.c                     | 783 +++++++++++++++++++++++
 src/common-ssh/ssh.c                      | 544 ++++++++++++++++
 src/common-ssh/user.c                     |  82 +++
 src/protocols/rdp/client.c                |   6 +-
 src/protocols/rdp/rdp.c                   |   6 +-
 src/protocols/rdp/rdp.h                   |   6 +-
 src/protocols/rdp/sftp.c                  |   2 +-
 src/protocols/ssh/client.c                |   4 +-
 src/protocols/ssh/clipboard.c             |   2 +-
 src/protocols/ssh/input.c                 |   2 +-
 src/protocols/ssh/sftp.c                  |   2 +-
 src/protocols/ssh/ssh.c                   |   6 +-
 src/protocols/ssh/ssh.h                   |   8 +-
 src/protocols/telnet/client.c             |   2 +-
 src/protocols/telnet/client.h             |   2 +-
 src/protocols/telnet/clipboard.c          |   2 +-
 src/protocols/telnet/input.c              |   2 +-
 src/protocols/telnet/telnet.c             |   2 +-
 src/protocols/telnet/telnet.h             |   2 +-
 src/protocols/telnet/user.c               |   2 +-
 src/protocols/vnc/client.c                |   6 +-
 src/protocols/vnc/sftp.c                  |   2 +-
 src/protocols/vnc/vnc.c                   |   4 +-
 src/protocols/vnc/vnc.h                   |   6 +-
 src/terminal/Makefile.am                  |  20 +-
 src/terminal/buffer.c                     |   4 +-
 src/terminal/buffer.h                     | 129 ----
 src/terminal/char_mappings.h              |  48 --
 src/terminal/common.c                     |   2 +-
 src/terminal/common.h                     |  53 --
 src/terminal/display.c                    |   6 +-
 src/terminal/display.h                    | 363 -----------
 src/terminal/scrollbar.c                  |   2 +-
 src/terminal/scrollbar.h                  | 357 -----------
 src/terminal/terminal.c                   |  14 +-
 src/terminal/terminal.h                   | 839 -------------------------
 src/terminal/terminal/buffer.h            | 129 ++++
 src/terminal/terminal/char_mappings.h     |  48 ++
 src/terminal/terminal/common.h            |  53 ++
 src/terminal/terminal/display.h           | 363 +++++++++++
 src/terminal/terminal/scrollbar.h         | 357 +++++++++++
 src/terminal/terminal/terminal.h          | 839 +++++++++++++++++++++++++
 src/terminal/terminal/terminal_handlers.h | 165 +++++
 src/terminal/terminal/types.h             | 124 ++++
 src/terminal/terminal/typescript.h        | 184 ++++++
 src/terminal/terminal_handlers.c          |   8 +-
 src/terminal/terminal_handlers.h          | 165 -----
 src/terminal/types.h                      | 124 ----
 src/terminal/typescript.c                 |   2 +-
 src/terminal/typescript.h                 | 184 ------
 68 files changed, 4870 insertions(+), 4870 deletions(-)
----------------------------------------------------------------------


Reply via email to