Merge remote-tracking branch 'upstream/master'
authorEmmanuel Ledoux <eledoux@hp.com>
Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)
committerEmmanuel Ledoux <emmanuel.ledoux@hp.com>
Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)
commite4840d3596f2648c605d77bcc30dcb902da761c4
tree1c53e81631395acb441fc2c3fee6bb8f274d600b
parentfba58a5b90bc1025d74f2fd8d9639dbab78346de
parent06bdc037a13fd84dee37e9b85dd6ac82a1f531df
Merge remote-tracking branch 'upstream/master'
.gitignore
client/common/cmdline.c
include/freerdp/settings.h
libfreerdp/common/settings.c