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
..
client	Merge remote-tracking branch 'upstream/master' into mh-channel-fix	2015-07-30 07:29:12 -07:00
ChannelOptions.cmake	channels/smartcard: refactoring	2014-04-03 17:29:12 -04:00
CMakeLists.txt	channels: refactoring of channels cmake scripts with macros	2012-10-17 02:14:19 -04:00