This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git


    from 87031b42 GUACAMOLE-1961: Merge improve terminal selection
     add 309971b2 GUACAMOLE-2182: Remove config.h includes from header files.
     add 14154e81 GUACAMOLE-2182: Add config.h includes to requires source 
files.
     add a9b98608 GUACAMOLE-2182: Merge correction to duplicate inclusion of 
"config.h".
     add 28598672 Merge 1.6.1 changes back to patch.
     add 2d3fe874 Merge changes from patch branch back to main.

No new revisions were added by this update.

Summary of changes:
 src/common-ssh/common-ssh/buffer.h        | 2 --
 src/common-ssh/common-ssh/key.h           | 2 --
 src/common/common/blank_cursor.h          | 2 --
 src/common/common/clipboard.h             | 2 --
 src/common/common/dot_cursor.h            | 2 --
 src/common/common/ibar_cursor.h           | 2 --
 src/common/common/iconv.h                 | 2 --
 src/common/common/io.h                    | 2 --
 src/common/common/json.h                  | 2 --
 src/common/common/list.h                  | 2 --
 src/common/common/pointer_cursor.h        | 2 --
 src/common/common/rect.h                  | 2 --
 src/common/common/string.h                | 2 --
 src/common/common/surface.h               | 1 -
 src/guacd/conf-args.h                     | 2 --
 src/guacd/conf-file.h                     | 2 --
 src/guacd/conf.h                          | 2 --
 src/guacd/connection.h                    | 2 --
 src/guacd/log.h                           | 2 --
 src/guacd/move-fd.h                       | 2 --
 src/guacd/proc-map.h                      | 1 -
 src/guacd/proc.h                          | 2 --
 src/guacenc/buffer.h                      | 2 --
 src/guacenc/cursor.h                      | 1 -
 src/guacenc/display.h                     | 1 -
 src/guacenc/encode.h                      | 2 --
 src/guacenc/ffmpeg-compat.h               | 1 -
 src/guacenc/guacenc.h                     | 2 --
 src/guacenc/image-stream.h                | 1 -
 src/guacenc/instructions.h                | 1 -
 src/guacenc/jpeg.h                        | 1 -
 src/guacenc/layer.h                       | 1 -
 src/guacenc/log.h                         | 2 --
 src/guacenc/parse.h                       | 2 --
 src/guacenc/png.h                         | 1 -
 src/guacenc/video.h                       | 1 -
 src/guacenc/webp.h                        | 1 -
 src/guaclog/guaclog.h                     | 2 --
 src/guaclog/instructions.h                | 1 -
 src/guaclog/interpret.h                   | 2 --
 src/guaclog/keydef.h                      | 2 --
 src/guaclog/log.h                         | 2 --
 src/guaclog/state.h                       | 1 -
 src/libguac/encode-jpeg.h                 | 2 --
 src/libguac/encode-png.h                  | 2 --
 src/libguac/encode-webp.h                 | 2 --
 src/libguac/guacamole/tcp.h               | 2 --
 src/libguac/raw_encoder.h                 | 2 --
 src/libguac/user-handlers.h               | 2 --
 src/protocols/kubernetes/argv.h           | 1 -
 src/protocols/rdp/argv.h                  | 2 --
 src/protocols/rdp/channels/rail.c         | 2 ++
 src/protocols/rdp/channels/rail.h         | 2 --
 src/protocols/rdp/decompose.h             | 1 -
 src/protocols/rdp/gdi.h                   | 2 --
 src/protocols/rdp/input-queue.c           | 2 ++
 src/protocols/rdp/keyboard.c              | 2 ++
 src/protocols/rdp/plugins/guacai/guacai.c | 2 ++
 src/protocols/rdp/rdp.c                   | 2 ++
 src/protocols/rdp/rdp.h                   | 1 -
 src/protocols/rdp/settings.h              | 1 -
 src/protocols/rdp/sftp.c                  | 2 ++
 src/protocols/ssh/argv.h                  | 2 --
 src/protocols/ssh/clipboard.h             | 2 --
 src/protocols/ssh/input.h                 | 2 --
 src/protocols/ssh/pipe.h                  | 2 --
 src/protocols/ssh/settings.h              | 2 --
 src/protocols/ssh/sftp.h                  | 2 --
 src/protocols/ssh/ssh.h                   | 2 --
 src/protocols/ssh/ssh_agent.h             | 2 --
 src/protocols/ssh/ttymode.h               | 2 --
 src/protocols/ssh/user.h                  | 2 --
 src/protocols/telnet/argv.h               | 2 --
 src/protocols/telnet/client.h             | 1 -
 src/protocols/telnet/clipboard.h          | 2 --
 src/protocols/telnet/input.h              | 2 --
 src/protocols/telnet/pipe.h               | 2 --
 src/protocols/telnet/settings.h           | 2 --
 src/protocols/telnet/telnet.h             | 1 -
 src/protocols/telnet/user.h               | 2 --
 src/protocols/vnc/argv.h                  | 2 --
 src/protocols/vnc/auth.h                  | 2 --
 src/protocols/vnc/clipboard.h             | 2 --
 src/protocols/vnc/cursor.h                | 2 --
 src/protocols/vnc/display.h               | 2 --
 src/protocols/vnc/input.h                 | 2 --
 src/protocols/vnc/log.h                   | 2 --
 src/protocols/vnc/settings.h              | 2 --
 src/protocols/vnc/sftp.h                  | 2 --
 src/protocols/vnc/user.h                  | 2 --
 src/protocols/vnc/vnc.h                   | 2 --
 src/pulse/pulse/pulse.h                   | 2 --
 src/terminal/display.c                    | 2 ++
 src/terminal/terminal.c                   | 2 ++
 src/terminal/terminal/terminal-handlers.h | 2 --
 95 files changed, 16 insertions(+), 154 deletions(-)

Reply via email to