Martin Haimberger 2862109337 Merge remote-tracking branch 'upstream/master' into mh-channel-fix ... Conflicts: channels/smartcard/client/smartcard_main.c channels/smartcard/client/smartcard_operations.c		2015-07-30 07:29:12 -07:00
..
freerdp	Merge remote-tracking branch 'upstream/master' into mh-channel-fix	2015-07-30 07:29:12 -07:00
CMakeLists.txt	libfreerdp-rail: remove	2014-11-12 19:51:17 -05:00