prepare 2.5.4 release

2015-11-12 14:56:51 +01:00
parent ae42576423
commit 0d4de870a5
3 changed files with 4 additions and 2 deletions
--- a/3
+++ b/3
@@ -1,3 +1,6 @@
+# Release 2.5.4
+ * increase MIN_RELAY_TX_FEE to avoid dust transactions
+
 # Release 2.5.3 (bugfixes)
 * installwizard: do not allow direct copy-paste of the seed
 * installwizard: fix bug #1531 (starting offline)
--- a/contrib/build-wine/build-electrum-git.sh
+++ b/contrib/build-wine/build-electrum-git.sh
@@ -24,7 +24,6 @@ if [ -d "electrum-git" ]; then
    echo "Pull"
    cd electrum-git
    git pull
-    git checkout $1
    cd ..
 else
    # GIT repository not found, clone it
--- a/lib/version.py
+++ b/lib/version.py
@@ -1,4 +1,4 @@
-ELECTRUM_VERSION = '2.5.3'  # version of the client package
+ELECTRUM_VERSION = '2.5.4'  # version of the client package
 PROTOCOL_VERSION = '0.10'   # protocol version requested
 NEW_SEED_VERSION = 11       # electrum versions >= 2.0
 OLD_SEED_VERSION = 4        # electrum versions < 2.0