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)
1  2 
client/common/cmdline.c
client/common/compatibility.c
libfreerdp/core/transport.c

Simple merge
Simple merge
Simple merge