aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2016-11-11 11:16:34 +0100
committerJonas Schnelli <dev@jonasschnelli.ch>2016-11-11 11:16:40 +0100
commitab914a65301bd48f2b6c7a64bf57295ae74f2902 (patch)
tree4d5cc61cffd8d24d7c09f1d9cf9a6c5317cf2e5a /contrib
parent7977a1157a3a5130ee41bcea93ff8b9a3896f891 (diff)
parent19f46f177ec5e1913f9be5b257dad95bc7a57c38 (diff)
downloadbitcoin-ab914a65301bd48f2b6c7a64bf57295ae74f2902.tar.xz
Merge #8996: Network activity toggle
19f46f1 Qt: New network_disabled icon (Luke Dashjr) 54cf997 RPC/Net: Use boolean consistently for networkactive, and remove from getinfo (Luke Dashjr) b2b33d9 Overhaul network activity toggle (Jonas Schnelli) 32efa79 Qt: Add GUI feedback and control of network activity state. (Jon Lund Steffensen) e38993b RPC: Add "togglenetwork" method to toggle network activity temporarily (Jon Lund Steffensen) 7c9a98a Allow network activity to be temporarily suspended. (Jon Lund Steffensen)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/debian/copyright3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 5cac6e533c..0fa06f1aa9 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -47,7 +47,10 @@ Comment: Site: https://github.com/stephenhutchings/typicons.font
Files: src/qt/res/icons/connect*.png
src/qt/res/src/connect-*.svg
+ src/qt/res/icons/network_disabled.png
+ src/qt/res/src/network_disabled.svg
Copyright: Marco Falke
+ Luke Dashjr
License: Expat
Comment: Inspired by Stephan Hutchings Typicons