aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-07-28 14:54:19 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-07-28 14:55:58 +0200
commit826d07101c569ab5ec5c0bfae9b0f5a8d72889b4 (patch)
treed5be93ee9419aa212d2fc5f684dec4cd632f034a
parent0449a17e41247a3ffba7982c9f506a98b31654e9 (diff)
parentd817187bdbeacb2eb6bd23d7faa38e667770e7e6 (diff)
downloadbitcoin-826d07101c569ab5ec5c0bfae9b0f5a8d72889b4.tar.xz
Merge pull request #4597
d817187 [Qt] remove ProxySocksVersion from OptionID (Philip Kaufmann)
-rw-r--r--src/qt/optionsmodel.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 89c2ec7453..9699f6eea6 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -32,7 +32,6 @@ public:
ProxyUse, // bool
ProxyIP, // QString
ProxyPort, // int
- ProxySocksVersion, // int
Fee, // qint64
DisplayUnit, // BitcoinUnits::Unit
DisplayAddresses, // bool