Index: branches/2020Q3/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h
===================================================================
--- branches/2020Q3/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h	(nonexistent)
+++ branches/2020Q3/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h	(revision 546867)
@@ -0,0 +1,28 @@
+--- source/shared_lib/include/feathery_ftp/ftpTypes.h.orig	2020-08-25 07:39:46 UTC
++++ source/shared_lib/include/feathery_ftp/ftpTypes.h
+@@ -69,7 +69,7 @@ typedef uint16_t port_t;
+ extern "C" {
+ #endif
+ 
+-int VERBOSE_MODE_ENABLED;
++extern int VERBOSE_MODE_ENABLED;
+ 
+ typedef ip_t (*ftpFindExternalFTPServerIpType)(ip_t clientIp);
+ typedef void (*ftpAddUPNPPortForwardType)(int internalPort, int externalPort);
+@@ -77,11 +77,11 @@ typedef void (*ftpRemoveUPNPPortForwardType)(int inter
+ typedef int (*ftpIsValidClientType)(ip_t clientIp);
+ typedef int (*ftpIsClientAllowedToGetFileType)(ip_t clientIp, const char *username, const char *filename);
+ 
+-ftpFindExternalFTPServerIpType	ftpFindExternalFTPServerIp;
+-ftpAddUPNPPortForwardType		ftpAddUPNPPortForward;
+-ftpRemoveUPNPPortForwardType	ftpRemoveUPNPPortForward;
+-ftpIsValidClientType            ftpIsValidClient;
+-ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile;
++extern ftpFindExternalFTPServerIpType	ftpFindExternalFTPServerIp;
++extern ftpAddUPNPPortForwardType		ftpAddUPNPPortForward;
++extern ftpRemoveUPNPPortForwardType	ftpRemoveUPNPPortForward;
++extern ftpIsValidClientType            ftpIsValidClient;
++extern ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile;
+ 
+ #ifdef	__cplusplus
+ }

Property changes on: branches/2020Q3/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c
===================================================================
--- branches/2020Q3/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c	(nonexistent)
+++ branches/2020Q3/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c	(revision 546867)
@@ -0,0 +1,16 @@
+--- source/shared_lib/sources/feathery_ftp/ftpRuntime.c.orig	2020-08-25 07:57:08 UTC
++++ source/shared_lib/sources/feathery_ftp/ftpRuntime.c
+@@ -30,6 +30,13 @@
+ #include "ftp.h"
+ #include "ftpMessages.h"
+ 
++int VERBOSE_MODE_ENABLED;
++
++ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp;
++ftpAddUPNPPortForwardType              ftpAddUPNPPortForward;
++ftpRemoveUPNPPortForwardType   ftpRemoveUPNPPortForward;
++ftpIsValidClientType            ftpIsValidClient;
++ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile;
+ 
+ /**
+  * @brief server-sockets that listens for incoming connections

Property changes on: branches/2020Q3/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 546866)
+++ branches/2020Q3	(revision 546867)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r546865