Martin Haimberger 420a86e1c7 Merge remote-tracking branch 'upstream/master' into mh-channel-fix ... Conflicts: channels/drdynvc/client/drdynvc_main.c channels/rdpgfx/client/rdpgfx_main.c client/X11/xf_gfx.c		2015-08-25 00:07:04 -07:00
..
Android	Merge remote-tracking branch 'upstream/master' into mh-channel	2015-07-15 01:57:07 -07:00
DirectFB	Fixes for malloc / calloc + other fixes	2015-06-22 19:21:47 +02:00
Mac	hardend cliprdr	2015-06-18 03:04:31 -07:00
Sample	Fixes for malloc / calloc + other fixes	2015-06-22 19:21:47 +02:00
Wayland	Fixed leaks, NULL dereferences and broken init.	2015-06-23 21:29:21 +02:00
Windows	Merge remote-tracking branch 'upstream/master' into mh-channel-fix	2015-07-30 07:29:12 -07:00
X11	Merge remote-tracking branch 'upstream/master' into mh-channel-fix	2015-08-25 00:07:04 -07:00
common	Merge pull request #2723 from akallabeth/pwd_from_stdin	2015-07-15 14:12:13 +02:00
iOS	client/ios: fix unchecked strdups	2015-06-22 19:09:59 +02:00
.gitignore	Fixes for malloc / calloc + other fixes	2015-06-22 19:21:47 +02:00
CMakeLists.txt	build: cmake 3.1 compatibility	2014-12-12 19:26:22 +01:00