Martin Haimberger 6e4e1c2773 Merge remote-tracking branch 'upstream/master' into mh-stream-fix ... Conflicts: client/Windows/wf_cliprdr.c		2015-06-18 03:06:40 -07:00
..
client	Merge remote-tracking branch 'upstream/master' into mh-stream-fix	2015-06-18 03:06:40 -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