Marc-André Moreau 8cdb3576c2 Merge branch 'master' of github.com:awakecoding/FreeRDP into smartcard
Conflicts:
	channels/smartcard/client/smartcard_main.c
2014-04-02 18:27:31 -04:00
..
2014-03-12 11:36:50 -04:00
2014-03-04 13:54:26 +08:00
2014-02-10 01:06:11 -05:00
2014-03-04 13:54:25 +08:00
2014-03-04 13:54:25 +08:00
2013-11-21 15:11:42 +01:00