Merge remote-tracking branch 'upstream/master' into mh-stream-fix
authorMartin Haimberger <martin.haimberger@thincast.com>
Thu, 18 Jun 2015 10:06:40 +0000 (03:06 -0700)
committerMartin Haimberger <martin.haimberger@thincast.com>
Thu, 18 Jun 2015 10:06:40 +0000 (03:06 -0700)
commit6e4e1c2773a10f6701a5a40ac3e25f31b1a4d8ed
treec0cfa88c4cdfc6f51d06913c99dac9ff754ff65c
parent76305a716c5cfa95fc821913b4c7fef025cb00bd
parentc8731eaa2c9c5e58457500ebe0c9f89d7e0c461f
Merge remote-tracking branch 'upstream/master' into mh-stream-fix

Conflicts:
client/Windows/wf_cliprdr.c
12 files changed:
channels/cliprdr/client/cliprdr_main.c
channels/drdynvc/client/drdynvc_main.c
channels/drive/client/drive_main.c
channels/encomsp/client/encomsp_main.c
channels/parallel/client/parallel_main.c
channels/rail/client/rail_main.c
channels/rdpdr/client/rdpdr_main.c
channels/smartcard/client/smartcard_main.c
client/Windows/wf_cliprdr.c
client/X11/xf_client.c
client/X11/xf_rail.c
libfreerdp/core/client.c