Merge pull request #2524 from jonasschnelli/new_splashscreen_fresh

new splash screen

diff --git a/contrib/verifysfbinaries/verify.sh b/contrib/verifysfbinaries/verify.sh
index 02814d894bcba4ccb71c9b4bc242b630c4c2a6b7..b109cd3ed0e67dbcafaea81520220d7912c68e59 100755 (executable)
--- a/contrib/verifysfbinaries/verify.sh
+++ b/contrib/verifysfbinaries/verify.sh
@@ -18,7 +18,7 @@ WORKINGDIR="/tmp/bitcoin"
 TMPFILE="hashes.tmp"
 
 #this URL is used if a version number is not specified as an argument to the script
-SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.0/SHA256SUMS.asc"
+SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.1/SHA256SUMS.asc"
 
 SIGNATUREFILENAME="SHA256SUMS.asc"
 RCSUBDIR="test/"

diff --git a/src/main.cpp b/src/main.cpp
index bf13e791510c49e18812f3b6f2f8c442ee1c70a8..6f3b5da96132254ea09afc0a27097109fafaa32f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -768,7 +768,7 @@ bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fCheckIn
 
         // Check against previous transactions
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.
-        if (!tx.CheckInputs(state, view, true, SCRIPT_VERIFY_P2SH))
+        if (!tx.CheckInputs(state, view, true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC))
         {
             return error("CTxMemPool::accept() : ConnectInputs failed %s", hash.ToString().c_str());
         }

diff --git a/src/makefile.unix b/src/makefile.unix
index 081edaf63efc9f53aa7b49be26b8ae7df07fc7cd..8110235647869f60d61417639faef0dcf7f16c54 100644 (file)
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -2,7 +2,13 @@
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+# :=0 --> UPnP support turned off by default at runtime
+# :=1 --> UPnP support turned on by default at runtime
+# :=- --> No UPnP support - miniupnp not required
 USE_UPNP:=0
+
+# :=1 --> Enable IPv6 support
+# :=0 --> Disable IPv6 support
 USE_IPV6:=1
 
 LINK:=$(CXX)

diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc
index eeac772dc981be1bbcb4a7700420592acb405982..3e3672a835f115e75f694926753aca337f920937 100644 (file)
--- a/src/qt/res/bitcoin-qt.rc
+++ b/src/qt/res/bitcoin-qt.rc
@@ -1,4 +1,5 @@
 IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico"
+IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico"
 
 #include <windows.h>             // needed for VERSIONINFO
 #include "../../clientversion.h" // holds the needed client version information

diff --git a/src/qt/res/icons/bitcoin_testnet.ico b/src/qt/res/icons/bitcoin_testnet.ico
new file mode 100755 (executable)
index 0000000..d67d9d5
Binary files /dev/null and b/src/qt/res/icons/bitcoin_testnet.ico differ

diff --git a/src/qt/res/icons/toolbar.png b/src/qt/res/icons/toolbar.png
index 44c7d88bca49fbe93b9ad46e8bad19207c71e2c9..b69430287124a6e56bcf8890ff4877077fc47dcb 100644 (file)
Binary files a/src/qt/res/icons/toolbar.png and b/src/qt/res/icons/toolbar.png differ

diff --git a/src/qt/res/icons/toolbar_testnet.png b/src/qt/res/icons/toolbar_testnet.png
index 9b5d82c787282ce1e305f6fd879766ea8e4784a5..dcac261c3611bb0a51fcb4db052cd51c0014cb94 100644 (file)
Binary files a/src/qt/res/icons/toolbar_testnet.png and b/src/qt/res/icons/toolbar_testnet.png differ