Michael Jumper 48bbc6a898 Merge branch 'testing-common-ssh' ... Conflicts: src/protocols/rdp/client.c		2015-08-13 16:29:22 -07:00
..
common	GUAC-240: New rectangle helper methods and utilities which will be used by adaptive encoding. Rectangle helper unit tests.	2015-08-06 17:19:35 -07:00
common-ssh	GUAC-1264: Require explicit free for users and sessions. Ensure SSH client data is zeroed upon allocation.	2015-07-24 13:20:36 -07:00
guacd	GUAC-1171: Adopt cleaner style for Makefile.am.	2015-07-08 15:39:25 -07:00
libguac	GUAC-1285: Implement jpeg_mem_dest() for platforms that lack it.	2015-08-07 17:39:10 +00:00
protocols	Merge branch 'testing-common-ssh'	2015-08-13 16:29:22 -07:00
terminal	GUAC-1195: Migrate to scrollbar style which works against dark OR light backgrounds.	2015-07-28 16:51:01 -07:00