Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Jan 2014 21:34:34 +0000 (16:34 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Jan 2014 21:34:34 +0000 (16:34 -0500)
commit3782c2ad72ff050e7e11a5814cf75997f564fede
tree7c729f816c28b9f347638d4a2cccf0a83ef6fc61
parentd2405a25f83c02df4ad8f86976b9b54e60df2a9b
parentae9c10e233141b4216b5f10a522a6702940c8a55
Merge branch 'master' of github.com:FreeRDP/FreeRDP
client/X11/xf_client.c
include/freerdp/freerdp.h
libfreerdp/core/freerdp.c
libfreerdp/core/tcp.c