Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 8 Jan 2015 19:22:05 +0000 (14:22 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 8 Jan 2015 19:22:05 +0000 (14:22 -0500)
commitd5b3f9cbd4c344b2d3c6fa7f491d4570d746d475
tree83076035b30b8d24f4b04d9bc8c473e441537e3d
parent51554ff16c700cd9d51a324a16c4d49f11f6acd0
parent5b1d379cfbfbadf8026570fa0309fd3924641b10
Merge branch 'master' of github.com:FreeRDP/FreeRDP
channels/rdpdr/client/rdpdr_main.c