From b768a38b76dff65a704c591be80b2b5e64b8a52f Mon Sep 17 00:00:00 2001
From: Michael Ford <fanquake@gmail.com>
Date: Thu, 21 Jun 2012 09:36:20 +0800
Subject: [PATCH 1/3] Update master
---
INSTALL | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/INSTALL b/INSTALL
index 6989d8902..fe7de5123 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,9 @@
Building Bitcoin
-See doc/readme-qt.rst for instructions on building Bitcoin QT,
+See doc/readme-qt.rst for instructions on building Bitcoin-Qt,
the intended-for-end-users, nice-graphical-interface, reference
implementation of Bitcoin.
See doc/build-*.txt for instructions on building bitcoind,
the intended-for-services, no-graphical-interface, reference
-implementation of Bitcoin.
+implementation of Bitcoin.
\ No newline at end of file
From e4ebe82ee290a29f4576eed9d3022be5aacb4d79 Mon Sep 17 00:00:00 2001
From: Michael Ford <fanquake@gmail.com>
Date: Mon, 25 Jun 2012 12:26:52 +0800
Subject: [PATCH 2/3] Update comments
---
src/ui_interface.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ui_interface.h b/src/ui_interface.h
index b94446cc2..c86e51e10 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -61,10 +61,10 @@ public:
/** Show message box. */
boost::signals2::signal<void (const std::string& message, const std::string& caption, int style)> ThreadSafeMessageBox;
- /** Ask the user whether he want to pay a fee or not. */
+ /** Ask the user whether they want to pay a fee or not. */
boost::signals2::signal<bool (int64 nFeeRequired, const std::string& strCaption), boost::signals2::last_value<bool> > ThreadSafeAskFee;
- /** Handle an URL passed on the command line. */
+ /** Handle a URL passed at the command line. */
boost::signals2::signal<void (const std::string& strURI)> ThreadSafeHandleURI;
/** Progress message during initialization. */
From 160eb23b0e361e0010ef15636c9317c82e913c12 Mon Sep 17 00:00:00 2001
From: Michael Ford <fanquake@gmail.com>
Date: Mon, 25 Jun 2012 12:28:29 +0800
Subject: [PATCH 3/3] Add Bitcoin dev Copyright
---
src/ui_interface.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/ui_interface.h b/src/ui_interface.h
index c86e51e10..0f7fdef26 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -1,4 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
+// Copyright (c) 2012 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_UI_INTERFACE_H