diff options
| -rw-r--r-- | contrib/gitian-downloader/linux-download-config | 2 | ||||
| -rw-r--r-- | contrib/gitian-downloader/sipa-key.pgp | bin | 13642 -> 108922 bytes | |||
| -rw-r--r-- | contrib/gitian-downloader/win32-download-config | 2 | ||||
| -rw-r--r-- | share/setup.nsi | 2 | ||||
| -rw-r--r-- | src/bignum.h | 2 | ||||
| -rw-r--r-- | src/main.h | 2 | ||||
| -rw-r--r-- | src/netbase.h | 2 | ||||
| -rw-r--r-- | src/qt/bitcoingui.cpp | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config index 36f5f682a..9a570a1dc 100644 --- a/contrib/gitian-downloader/linux-download-config +++ b/contrib/gitian-downloader/linux-download-config @@ -17,7 +17,7 @@ signers: key: devrandom D762373D24904A3E42F33B08B9A408E71DAAC974: weight: 40 - name: Sipa + name: "Pieter Wuille" key: sipa 77E72E69DA7EE0A148C06B21B34821D4944DE5F7: weight: 40 diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-downloader/sipa-key.pgp Binary files differindex 086c9eb42..a52a5deb1 100644 --- a/contrib/gitian-downloader/sipa-key.pgp +++ b/contrib/gitian-downloader/sipa-key.pgp diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config index b1e1c7399..3974d6155 100644 --- a/contrib/gitian-downloader/win32-download-config +++ b/contrib/gitian-downloader/win32-download-config @@ -17,7 +17,7 @@ signers: key: devrandom D762373D24904A3E42F33B08B9A408E71DAAC974: weight: 40 - name: Sipa + name: "Pieter Wuille" key: sipa 77E72E69DA7EE0A148C06B21B34821D4944DE5F7: weight: 40 diff --git a/share/setup.nsi b/share/setup.nsi index cc19daf84..4dc2ad5f0 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -51,7 +51,7 @@ CRCCheck on XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.6.0.6
+VIProductVersion 0.6.0.99
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/bignum.h b/src/bignum.h index c7c2ff173..95e21977e 100644 --- a/src/bignum.h +++ b/src/bignum.h @@ -47,7 +47,7 @@ public: }; -/** C++ wrapper for BIGNUM (OpenSSl bignum) */ +/** C++ wrapper for BIGNUM (OpenSSL bignum) */ class CBigNum : public BIGNUM { public: diff --git a/src/main.h b/src/main.h index 18d5dbdd7..16159e18b 100644 --- a/src/main.h +++ b/src/main.h @@ -26,7 +26,7 @@ class CInv; class CRequestTracker; class CNode; -static const int CLIENT_VERSION = 60006; +static const int CLIENT_VERSION = 60099; static const bool VERSION_IS_BETA = true; extern const std::string CLIENT_NAME; diff --git a/src/netbase.h b/src/netbase.h index b5f9d5fad..43189c37e 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -81,7 +81,7 @@ class CNetAddr ) }; -/** A combnation of a network address (CNetAddr) and a (TCP) port */ +/** A combination of a network address (CNetAddr) and a (TCP) port */ class CService : public CNetAddr { protected: diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 7bce1286c..91696310b 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -376,7 +376,7 @@ void BitcoinGUI::createTrayIcon() trayIcon = new QSystemTrayIcon(this); trayIconMenu = new QMenu(this); trayIcon->setContextMenu(trayIconMenu); - trayIcon->setToolTip("Bitcoin client"); + trayIcon->setToolTip(tr("Bitcoin client")); trayIcon->setIcon(QIcon(":/icons/toolbar")); connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason))); |