Marc-André Moreau 8cdb3576c2 Merge branch 'master' of github.com:awakecoding/FreeRDP into smartcard ...

Conflicts:
	channels/smartcard/client/smartcard_main.c

2014-04-02 18:27:31 -04:00

..

client

Merge branch 'master' of github.com:awakecoding/FreeRDP into smartcard

2014-04-02 18:27:31 -04:00

server

libfreerdp-core: expose opaque HANDLE instead of WTSVirtualChannelManager*

2014-02-27 13:30:04 -05:00

ChannelOptions.cmake

channels/rdpdr: start server-side device redirection

2013-08-18 18:09:12 -04:00

CMakeLists.txt

channels/rdpdr: start server-side device redirection

2013-08-18 18:09:12 -04:00