Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 21 May 2014 15:17:58 +0000 (11:17 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 21 May 2014 15:17:58 +0000 (11:17 -0400)
commit4bac8374de67cac47460c31525ade0b2bf889a83
tree299e5b487570bdbb609a125a42c2f59df86aef6a
parent37b0d634edfb03e8bf86b3c2365b57e9197b0b76
parent94a836078f075a56753b9495d897a666095808e7
Merge branch 'master' of github.com:FreeRDP/FreeRDP
CMakeLists.txt
client/common/cmdline.c
winpr/libwinpr/synch/wait.c