Merge branch 'master' of github.com:FreeRDP/FreeRDP

Conflicts:
	libfreerdp/core/input.c
	libfreerdp/core/update.c

diff --cc CMakeLists.txt
Simple merge

diff --cc client/common/file.c
Simple merge

diff --cc libfreerdp/core/input.c
index 7b50531,4e001ba..c9ce377
--- 1/libfreerdp/core/input.c
--- 2/libfreerdp/core/input.c
+++ b/libfreerdp/core/input.c
@@@ -494,10 -494,9 +494,9 @@@ static void input_free_queued_message(v
  
  rdpInput* input_new(rdpRdp* rdp)
  {
-       wObject cb;
 -      const wObject cb = { NULL, NULL, NULL, input_free_queued_message , NULL };
++      const wObject cb = { NULL, NULL, NULL, input_free_queued_message, NULL };
        rdpInput* input;
  
-       cb.fnObjectFree = input_free_queued_message ;
        input = (rdpInput*) malloc(sizeof(rdpInput));
  
        if (input != NULL)