aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-06-25 06:49:59 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2012-06-25 06:49:59 -0700
commit2849d0661d0c9154924099aafb986552f562d8f7 (patch)
tree56e2b3a78833407a884759a3d191c534f6262151
parent1282c8653e03473bced07368283d16ebfd45f256 (diff)
parent160eb23b0e361e0010ef15636c9317c82e913c12 (diff)
Merge pull request #1501 from fanquake/master
QT to Qt
-rw-r--r--INSTALL4
-rw-r--r--src/ui_interface.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/INSTALL b/INSTALL
index 6989d8902d..fe7de5123f 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
diff --git a/src/ui_interface.h b/src/ui_interface.h
index b94446cc20..0f7fdef264 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
@@ -61,10 +62,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. */