Merge pull request #4597

laanwj · laanwj · commit 826d07101c56 · 2014-07-28T14:55:58.000+02:00
d817187 [Qt] remove ProxySocksVersion from OptionID (Philip Kaufmann)
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
@@ -32,7 +32,6 @@ class OptionsModel : public QAbstractListModel
         ProxyUse,               // bool
         ProxyIP,                // QString
         ProxyPort,              // int
-        ProxySocksVersion,      // int
         Fee,                    // qint64
         DisplayUnit,            // BitcoinUnits::Unit
         DisplayAddresses,       // bool
