aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-08-16 10:28:24 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-08-16 10:28:24 +0200
commitb90c9ecb132ad686275afafe506f8044719245ec (patch)
treefc805f0c16b23faff1eb10b46da132e8c1951712 /src/wallet.cpp
parent0a76546ae973241259aa5019e0d27758f86ef891 (diff)
parenteb72eae304a7067eb568437c66c4d831b075dab9 (diff)
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index fcd49e66b9..076a9f8eed 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2009-2011 Satoshi Nakamoto & Bitcoin developers
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2011 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file license.txt or http://www.opensource.org/licenses/mit-license.php.