Merge branch 'ports'
authorEmmanuel Ledoux <eledoux@hp.com>
Mon, 30 Jun 2014 15:22:15 +0000 (17:22 +0200)
committerEmmanuel Ledoux <emmanuel.ledoux@hp.com>
Mon, 30 Jun 2014 15:22:15 +0000 (17:22 +0200)
commit9fc225ac5d86d47c9a4e9b15c684a7faff19722b
treee53ad0a87acafef42c94e1be93df6e0b0a8ecc70
parent9e1793c8ffda575b00275616252d1568e42f574b
parentd93c6b1362d0f290400faff8d8fc065cacab9d03
Merge branch 'ports'

Conflicts:
channels/serial/client/serial_tty.c
.gitignore
channels/serial/client/serial_main.c
client/common/cmdline.c
include/freerdp/settings.h
libfreerdp/common/settings.c
winpr/include/winpr/file.h
winpr/libwinpr/file/file.c
winpr/libwinpr/handle/handle.c
winpr/libwinpr/handle/handle.h