Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 11 Aug 2014 14:36:07 +0000 (10:36 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 11 Aug 2014 14:36:07 +0000 (10:36 -0400)
commitcff9c16c1ee57674d52eacda9080a40da1c96eaf
tree038109aed4b8b93a482f67b77770844d5581a17b
parentb990c2002ad1079e1377cd6700aaa7fc0bf3346a
parent067da290dd6b95ad8b4590c6cdd51075717f50d9
Merge branch 'master' of github.com:FreeRDP/FreeRDP

Conflicts:
channels/disp/client/disp_main.c
channels/disp/client/disp_main.c
channels/disp/client/disp_main.h
channels/rdpgfx/client/rdpgfx_main.c
client/common/file.c
libfreerdp/codec/h264.c
libfreerdp/common/settings.c
libfreerdp/core/info.c
libfreerdp/gdi/gdi.c