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
..
client	Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx	2014-06-12 12:08:15 -04:00
ChannelOptions.cmake	channels: cmake cleanup, USB redirection refactoring	2012-11-20 19:34:52 -05:00
CMakeLists.txt	channels: refactoring of channel subsystems	2012-11-19 22:31:15 -05:00