diff options
| author | Jeff Garzik <jeff@garzik.org> | 2011-05-12 17:36:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-12 17:36:42 -0400 |
| commit | 73eb306cfd2fdc163e12a15abd496986436fcb07 (patch) | |
| tree | ca8651eb2d0a495fe7e44e39a06f27b0a4e99915 | |
| parent | 9398bf946cf2e59cb8731481d8f2c5820e95dc1e (diff) | |
| parent | 5d1d69453a8bc9564a40b3bb2e1f05de233e868d (diff) | |
| download | bitcoin-73eb306cfd2fdc163e12a15abd496986436fcb07.tar.xz | |
Merge branch 'fUseUPnPfix' of https://github.com/TheBlueMatt/bitcoin into tmp
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8d7640f640..4f9ceac5ac 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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 |