Michael Jumper 4e97843ef0 Merge branch 'master' into experimental ... Conflicts: src/common/guac_surface.c		2015-09-14 14:19:54 -07:00
..
rdp	GUAC-240: Remove guac_protocol_send_png() and guac_protocol_send_jpeg().	2015-09-04 12:59:00 -07:00
ssh	GUAC-1195: Add "color-scheme" parameter to SSH and telnet.	2015-07-28 16:46:32 -07:00
telnet	GUAC-1296: Send IAC BRK when Pause, Break, or Ctrl+0 are pressed.	2015-08-23 16:21:50 -07:00
vnc	Merge branch 'master' into experimental	2015-09-14 14:19:54 -07:00