Merged changes from awakecoding/master
authorMike McDonald <Mike.McDonald@software.dell.com>
Tue, 3 Jun 2014 11:05:31 +0000 (07:05 -0400)
committerMike McDonald <Mike.McDonald@software.dell.com>
Tue, 3 Jun 2014 11:05:31 +0000 (07:05 -0400)
commitef1242c56cd82601d02f6973d56ac3bae481df88
treee1bf44393bc731dec2c4b841a1f13ecd7fb77c6a
parentd1c764b374a4dd939573fb298f87d3caff526c7a
parent659f80e172885924c9fb899155c7b76cc8974475
Merged changes from awakecoding/master
winpr/libwinpr/smartcard/smartcard_pcsc.c