Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Nov 2013 00:41:59 +0000 (19:41 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Nov 2013 00:41:59 +0000 (19:41 -0500)
commitc4492411e4da539b24f3ea57197dd3dca9e3e585
tree5e0c127a9fc50a4a968405136f6fe1ed98cacbdc
parentb0b8b6aa9e5dd10389cb5557c6ba32760b7c5b8c
parentc347dd08437d17d741283fc11caf023737431fba
Merge branch 'master' of github.com:FreeRDP/FreeRDP
client/common/cmdline.c
client/common/compatibility.c
libfreerdp/core/transport.c