Armin Novak 0f3dcc2765 Merge branch 'patch-2' of https://github.com/AMV007/FreeRDP into AMV007-patch-2 ... Conflicts: channels/tsmf/client/tsmf_ifman.c channels/tsmf/client/tsmf_media.c		2017-01-17 10:03:05 +01:00
..
client	Merge branch 'patch-2' of https://github.com/AMV007/FreeRDP into AMV007-patch-2	2017-01-17 10:03:05 +01: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