Added function header for freerdp_update_gateway_usage_method
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Hardening (4) and others
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: add locks to disable full duplex BIOs (currently unsafe)
  transport: add another null pointer check.
  transport: add a null pointer check.
  rdpsnd/server: fix incorrect use of channe handle.
  tcp: add timeout to prevent buggy client from hanging.
  Check that bpp has reasonable value
  Check for bpp > 0
  Set checks to be strict and also check xorBpp field
  Fixes for CVE-2014-0250
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
libfreerdp-client: fix /gfx option
channels/disp: cleanup
channels/rdpgfx: start working on capability sets
channels/drdynvc: add OnOpen callback
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
channels/drdynvc: add state machine, add workaround for missing capabilities pdu
libfreerdp-codec: stub new ZGFX (RDP8) bulk compressor/decompressor
libfreerdp-codec: integrate basic RDP8 decompression support
channels/rdpgfx: start parsing pdus
channels/rdpgfx: parse all core egfx pdus
channels/rdpgfx: stub bitmap decompression
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
channels/rdpgfx: define interface of callbacks
xfreerdp: start integrating graphics pipeline
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx