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

This commit is contained in:
Jeff Garzik
2011-05-12 17:36:42 -04:00
committed by Jeff Garzik

View File

@@ -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