Marc-André Moreau 42c83c25f8 Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx ... Conflicts: channels/tsmf/client/tsmf_main.c		2014-06-12 12:08:15 -04:00
..
Android	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
common	Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx	2014-06-12 12:03:08 -04:00
DirectFB	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
iOS	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
Mac	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
Sample	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
Windows	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
X11	Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx	2014-06-12 12:08:15 -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