Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 27 Feb 2013 14:38:39 +0000 (09:38 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 27 Feb 2013 14:38:39 +0000 (09:38 -0500)
commitddf4c6e0ff204ee5a79ada4f31fd00deb4d0698d
treea0e3f31fac5a61e39966217d31229fae58c771a6
parent6a775ff032879a6e6d2c06062d9091d25f729e85
parent7d99f0c24c313c20b215d033c08d80cd8261fb9b
Merge branch 'master' of github.com:FreeRDP/FreeRDP
client/common/cmdline.c
libfreerdp/codec/CMakeLists.txt
libfreerdp/locale/keyboard_x11.c