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

diff --cc CMakeLists.txt
Simple merge

diff --cc client/Mac/MRDPView.m
Simple merge

diff --cc client/Mac/cli/AppDelegate.m
index 83061d3,1fe58a5..677e522
--- 1/client/Mac/cli/AppDelegate.m
--- 2/client/Mac/cli/AppDelegate.m
+++ b/client/Mac/cli/AppDelegate.m
@@@ -53,9 -65,20 +66,21 @@@ void mac_set_view_size(rdpContext* cont
                PubSub_SubscribeConnectionResult(context->pubSub, AppDelegate_ConnectionResultEventHandler);
                PubSub_SubscribeErrorInfo(context->pubSub, AppDelegate_ErrorInfoEventHandler);
                PubSub_SubscribeEmbedWindow(context->pubSub, AppDelegate_EmbedWindowEventHandler);
 +              PubSub_SubscribeResizeWindow(context->pubSub, AppDelegate_ResizeWindowEventHandler);
                
                freerdp_client_start(context);
+ 
+               NSString *winTitle;
+               if ( mfc->context.settings->WindowTitle && mfc->context.settings->WindowTitle[0])
+               {
+                       winTitle = [[NSString alloc] initWithCString:mfc->context.settings->WindowTitle];
+               }
+               else
+               {
+                       winTitle = [[NSString alloc] initWithCString:"FreeRDP"];
+               }
+ 
+               [window setTitle:winTitle];
        }
  }
  

diff --cc winpr/libwinpr/file/file.c
Simple merge

diff --cc winpr/libwinpr/utils/debug.c
Simple merge