Armin Novak 632800679b Merge branch 'smartcard_fixes' of github.com:akallabeth/FreeRDP into smartcard_fixes ... Conflicts: channels/smartcard/client/smartcard_operations.c		2013-09-24 09:48:21 +02:00
..
client	Merge branch 'smartcard_fixes' of github.com:akallabeth/FreeRDP into smartcard_fixes	2013-09-24 09:48:21 +02:00
ChannelOptions.cmake	channels: cmake cleanup, USB redirection refactoring	2012-11-20 19:34:52 -05:00
CMakeLists.txt	channels: refactoring of channels cmake scripts with macros	2012-10-17 02:14:19 -04:00