Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 20 Jan 2015 14:29:21 +0000 (09:29 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 20 Jan 2015 14:29:21 +0000 (09:29 -0500)
commitb057d1eaf70f7f2d8bf48dfe5106fb5d778b3a51
tree0a541141d78d817789fba76f5b1368e21ece9be8
parent73cfa920a99cea6945ea6ac444da6dd9e87986be
parent8e7b80b25ab323df35fc0eec325a598ac161c45a
Merge branch 'master' of github.com:FreeRDP/FreeRDP
channels/smartcard/client/smartcard_pack.c