Mercurial > hg > bitcoin

changeset 3099:5d16ac447d50 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #1501 from fanquake/master QT to Qt
author Wladimir J. van der Laan <laanwj@gmail.com>
date Mon, 25 Jun 2012 06:49:59 -0700
parents 411582ccad38 (current diff) b2ffb5406fb0 (diff)
children 0b91c4c21d69 d9b532167e18 b364429d59ec
files
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 @@
     /** 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. */