diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-28 15:25:48 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-28 15:25:48 -0400 |
| commit | 5fa83965f22ae92f86de74104b621c2168d37698 (patch) | |
| tree | 65985e36d6c2068fcddd098e28c3b34ba63be1c4 | |
| parent | 1b71f82e38227f74b1e98764cd1a33a4524441f1 (diff) | |
| parent | 3948eb0c54edf308a2376d26fa6c1d6da8be6a34 (diff) | |
Merge branch 'patch-5' of https://github.com/xanatos/bitcoin
| -rw-r--r-- | src/qt/optionsmodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index c74a8dfb43..b196f0bf60 100644 --- 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 |