Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 3 Jul 2014 16:03:39 +0000 (12:03 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 3 Jul 2014 16:03:39 +0000 (12:03 -0400)
commitbde954107ddb4220fa32f1eeab8d3cd14ea570bf
treed0036c60791104e92a5e03c5f184f72b8ca55b02
parent2f5011a438f2a96c1e70f9262d95b7cb2e3d5bd1
parent4d3d78c48799dbce9f1d6aa827aa5a884992476f
Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx

Conflicts:
client/X11/xf_gfx.c
channels/rdpgfx/client/rdpgfx_main.c
client/X11/xf_gfx.c
client/X11/xfreerdp.h
libfreerdp/codec/CMakeLists.txt
libfreerdp/codec/h264.c