freerdp: merge with master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 28 Jun 2013 16:50:24 +0000 (12:50 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 28 Jun 2013 16:50:24 +0000 (12:50 -0400)
commit863b51f93897134b8e4351c3a1b9ce9809a851df
treeddb142a087989b45c5534bb3605458383495dead
parent1d0a579590c387a00964b7d7fe8538ce82146586
parentfd365121a84a651246cecda8f47d13ad9c317c39
freerdp: merge with master
CMakeLists.txt
client/X11/xf_graphics.c
client/common/cmdline.c
libfreerdp/common/settings.c
libfreerdp/core/freerdp.c
libfreerdp/core/update.c
libfreerdp/locale/keyboard_xkbfile.c
server/Sample/sfreerdp.c
winpr/libwinpr/handle/handle.h