Merge branch 'egfx' of https://github.com/awakecoding/freerdp into egfx_new
authorerbth <t.erbesdobler@team103.com>
Mon, 8 Sep 2014 14:56:45 +0000 (16:56 +0200)
committererbth <t.erbesdobler@team103.com>
Mon, 8 Sep 2014 14:56:45 +0000 (16:56 +0200)
commitcbc8b3a7e1830121082d71a18b3eaed8664f3200
tree320e173fa55727e261f4ac425ec850ce2f485eaa
parentfee370e4b2a9327b14be3cfb24a24e70a1567544
parentad9092baf957037e8d6d5a0ac9d26cba1f32e864
Merge branch 'egfx' of https://github.com/awakecoding/freerdp into egfx_new

Conflicts:
channels/drdynvc/client/dvcman.c
include/freerdp/codec/h264.h
libfreerdp/codec/h264.c after this merge h264 doesn't work anymore!!
libfreerdp/utils/svc_plugin.c
channels/drdynvc/client/dvcman.c
channels/rdpgfx/client/rdpgfx_main.c
client/X11/xf_gfx.c
include/freerdp/codec/h264.h
libfreerdp/codec/h264.c
libfreerdp/utils/svc_plugin.c