Merge branch 'master' of github.com:awakecoding/FreeRDP into smartcard
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 2 Apr 2014 22:27:31 +0000 (18:27 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 2 Apr 2014 22:27:31 +0000 (18:27 -0400)
commit8cdb3576c2555749b70806936b508fb53cff30a3
tree0b22d96920fc40c51d1e64110cdc0e056aed154a
parent1dbf2792122798af4df135605ab1740c6cfbf84b
parent8bf5559f5170deb2b51116a320d437e7d0032619
Merge branch 'master' of github.com:awakecoding/FreeRDP into smartcard

Conflicts:
channels/smartcard/client/smartcard_main.c
channels/rdpdr/client/devman.c
channels/rdpdr/client/irp.c
channels/smartcard/client/smartcard_main.c
channels/smartcard/client/smartcard_main.h
channels/smartcard/client/smartcard_operations.c
winpr/libwinpr/utils/collections/ListDictionary.c