Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 23 Oct 2013 18:18:40 +0000 (14:18 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 23 Oct 2013 18:18:40 +0000 (14:18 -0400)
commitd30f66b1b7af5e9b820ba5264c3e4d37138aa8ef
tree61c6a213daeb7ee343016da097333816ddb13075
parent9c536cfe01845ce449b8a9e10a77ec0567581528
parent5ef8d929dcb68911f966db9e259e76d393a1b6b3
Merge branch 'master' of github.com:FreeRDP/FreeRDP
channels/drive/client/drive_file.c
channels/drive/client/drive_main.c
client/Windows/wf_event.c
client/common/cmdline.c
include/freerdp/settings.h
libfreerdp/core/info.c
libfreerdp/core/settings.c
winpr/libwinpr/synch/wait.c