Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 12 Jun 2014 16:03:08 +0000 (12:03 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 12 Jun 2014 16:03:08 +0000 (12:03 -0400)
commit6f9a256c5cec2eac6d06eebc3907fffd9cbe022e
tree20d3ad0500c6846c60f56528fce764821b71d8e5
parent38ac1fd7b0dd37cdb70f99c9a8de1b176bb17b70
parent2da89cd8e5adbb8506a750ee049bc6e9d233297d
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

Conflicts:
channels/drdynvc/client/dvcman.c
client/X11/xf_client.c
include/freerdp/dvc.h
channels/drdynvc/client/drdynvc_main.c
channels/drdynvc/client/dvcman.c
channels/drdynvc/client/dvcman.h
client/X11/xf_client.c
client/common/cmdline.c
include/freerdp/dvc.h