Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 17 Sep 2014 23:09:56 +0000 (19:09 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 17 Sep 2014 23:09:56 +0000 (19:09 -0400)
commit2a5192b027bb73b553278caf59bb07b5294d0d35
tree21663a5dc23dcc1cd3fe3769dabbce7f61ceab10
parentf0bff7e890d7d35e5ee6f7563a70ac3231716c0b
parent8e93a6d96c275978d36d7dabb501ae5881d4780c
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

Conflicts:
client/Windows/wf_cliprdr.h
client/Windows/wf_event.h
client/X11/xf_client.c
client/X11/xf_gdi.c
libfreerdp/gdi/gdi.c
server/Mac/mf_input.c
23 files changed:
client/Mac/MRDPView.m
client/Windows/CMakeLists.txt
client/Windows/wf_client.c
client/Windows/wf_client.h
client/Windows/wf_cliprdr.c
client/Windows/wf_cliprdr.h
client/Windows/wf_event.h
client/Windows/wf_gdi.c
client/Windows/wf_graphics.c
client/X11/xf_client.c
client/X11/xf_gdi.c
client/X11/xf_gfx.c
client/X11/xf_graphics.c
include/freerdp/gdi/gdi.h
libfreerdp/cache/palette.c
libfreerdp/codec/clear.c
libfreerdp/codec/planar.c
libfreerdp/codec/progressive.c
libfreerdp/gdi/gdi.c
libfreerdp/gdi/gfx.c
libfreerdp/gdi/graphics.c
server/Mac/mf_input.c
winpr/libwinpr/sspi/NTLM/ntlm_message.c