Merge branch 'patch-5' of https://github.com/xanatos/bitcoin

2012-06-28 15:25:48 -04:00 · 2012-06-28 15:25:48 -04:00 · 5fa83965f2
parent 1b71f82e38 3948eb0c54
commit 5fa83965f2
1 changed files with 1 additions and 1 deletions
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@ -23,7 +23,7 @@ public:
        ProxyUse, // bool
        ProxySocksVersion, // int
        ProxyIP, // QString
-        ProxyPort, // QString
+        ProxyPort, // int
        Fee, // qint64
        DisplayUnit, // BitcoinUnits::Unit
        DisplayAddresses, // bool