Marc-André Moreau 6f9a256c5c Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx ... Conflicts: channels/drdynvc/client/dvcman.c client/X11/xf_client.c include/freerdp/dvc.h		2014-06-12 12:03:08 -04:00
..
Android	libfreerdp-core: remove unnecessary usage of freerdp_channels_data	2014-02-15 15:26:34 -05:00
common	Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx	2014-06-12 12:03:08 -04:00
DirectFB	libfreerdp-client: refactor and decouple rdpSettings* from client context	2013-10-12 21:07:12 -04:00
iOS	Merge pull request #1633 from MicahChase/master	2014-04-22 08:36:25 +02:00
Mac	Added context error codes	2014-03-28 12:23:16 -04:00
Sample	sample client: fix ReceiveChannelData prototype	2014-04-17 10:04:12 +02:00
Windows	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-05-21 11:17:58 -04:00
X11	Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx	2014-06-12 12:03:08 -04:00
.gitignore	freerdp: remove vendor-specific options from build system, add automatic ways of including external clients/servers	2013-09-03 20:37:04 -04:00
CMakeLists.txt	freerdp: add more vendor options	2014-05-09 12:25:05 -04:00