Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 20 May 2015 15:40:48 +0000 (11:40 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 20 May 2015 15:40:48 +0000 (11:40 -0400)
commit7e1dbd505b29743b7f6e3dd82be6aa2782ada992
treec09d70433fcdc01a1b467bf5de05b8e805c37d6a
parent4c5ac6cfb015011c08a6cf423b26b8a77fe780bc
parentb6cb94b60ebc689e79ad9ed23aa7e3576ab3632e
Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP

Conflicts:
channels/rdpdr/server/rdpdr_main.c
channels/rdpdr/server/rdpdr_main.c
libfreerdp/core/capabilities.c
libfreerdp/core/peer.c
winpr/libwinpr/utils/wlog/FileAppender.c