Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoît LeBlanc <benoit.leblanc@awakecoding.com>
Thu, 7 Nov 2013 15:42:35 +0000 (10:42 -0500)
committerBenoît LeBlanc <benoit.leblanc@awakecoding.com>
Thu, 7 Nov 2013 15:42:35 +0000 (10:42 -0500)
commit7215f4295f643473f8531a150ff721ae66d3683c
tree9ae09944696fcd86dc80920846703581b124d6fd
parentb50969e05df438087d629cdfd8b8c2cf8eb2347f
parentd754e4f9a8071a6ccb2146271af3908ed0e77288
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

Conflicts:
include/freerdp/client.h
client/common/client.c
client/common/file.c
include/freerdp/client.h
include/freerdp/client/file.h