Merge branch 'master' of https://github.com/Electron-Cash/Electron-Cash

clifordsymack · Feb 23, 2019 · c035295 · c035295
2 parents 17de60e + af34826
commit c035295
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
@@ -261,6 +261,8 @@ and there is no warning message.
   compatible. (cculianu)
 * Added "Export contacts" facility to UI so you can export all your contacts to
   a file. (Strangely, we had "Import contacts", but no export!) (cculianu)
+* Added "Wallet -> Rebuild history" to Qt GUI. Allows users to re-synch entire
+  wallet from server, on demand. (commit: a72b2a72, cculianu)
 * Request fee estimate from ElectrumX/ElectronX server every 20 minutes
   (cculianu)
 * Performance improvements for wallets with huge numbers of tx's (cculianu)

diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh
@@ -3,7 +3,7 @@
 NAME_ROOT=Electron-Cash
 PYTHON_VERSION=3.5.4
 
-CHECKOUT_TAG=3.3.5
+CHECKOUT_TAG=3.3.6
 
 # These settings probably don't need any change
 export WINEPREFIX=/opt/wine64

diff --git a/contrib/update_checker/releases.json b/contrib/update_checker/releases.json
@@ -1,6 +1,6 @@
 {
-     "3.3.5": {
-     	"bitcoincash:qphax4cg8sxuc0qnzk6sx25939ma7y877uz04s2z82": "HPC+QnKXdxW/V6qeVFGjYKeP9YQ6DL16Y1SQznavG/G7FUEpMK1wnkAj5yO/RW440mvXxds1PpS35RaEMtvbgJw="
+     "3.3.6": {
+         "bitcoincash:qphax4cg8sxuc0qnzk6sx25939ma7y877uz04s2z82": "G2IsMjWVOQcDzlP/a3KYgVaUOAImn87Y9mnSrKu6wmylcmEeDaPxL57p35OuaovGqQona+CkpM3ozByeLozLU64="
      },
      "3.3.4CS": {
          "bitcoincash:qphax4cg8sxuc0qnzk6sx25939ma7y877uz04s2z82": "HNkxAJzvWGP5/YPIJrZRQFK5btM1nd/NKCwWAlejc5oEJ6VNbzo6KfqOoIBpPTauK21Tp/qXY7SMmlO+6ssMPOA="