Merge branch 'fUseUPnPfix' of https://github.com/TheBlueMatt/bitcoin into tmp

14 years ago · 73eb306cfd
1 changed files with 0 additions and 2 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -65,13 +65,11 @@ int fLimitProcessors = false;
				@@ -65,13 +65,11 @@ int fLimitProcessors = false;
 int nLimitProcessors = 1;
 int fMinimizeToTray = true;
 int fMinimizeOnClose = true;
-#ifdef USE_UPNP
 #if USE_UPNP
 int fUseUPnP = true;
 #else
 int fUseUPnP = false;
 #endif
-#endif