Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 23 Nov 2013 21:39:29 +0000 (16:39 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 23 Nov 2013 21:39:29 +0000 (16:39 -0500)
commit83ad1730b8588224ce7397a1095846c9719745be
tree4f81ac7535434a9f02d442baa98843a006647cd3
parentcf0dace9d9464fa486575e56647199e529d4431a
parentfcea789a7743b78fcecff4f3ad77ce1d47a4f7c5
Merge branch 'master' of github.com:FreeRDP/FreeRDP

Conflicts:
libfreerdp/core/input.c
libfreerdp/core/update.c
CMakeLists.txt
client/common/file.c
libfreerdp/core/input.c