Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 25 Sep 2014 14:35:14 +0000 (10:35 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 25 Sep 2014 14:35:14 +0000 (10:35 -0400)
commitc762a4d5a285d935e8179b7ef6af9cf7e2b7f4a7
tree955e7627701586c7a8b881526777a3dec3b9fc79
parent72fff184ddac5bfcbb4656088dc723f59074d193
parentbbf47324704d963371ca396a9cd2428a1d661bd2
Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow
client/common/cmdline.c
include/freerdp/settings.h