diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-08-16 10:28:24 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-08-16 10:28:24 +0200 |
commit | b90c9ecb132ad686275afafe506f8044719245ec (patch) | |
tree | fc805f0c16b23faff1eb10b46da132e8c1951712 /src/script.cpp | |
parent | 0a76546ae973241259aa5019e0d27758f86ef891 (diff) | |
parent | eb72eae304a7067eb568437c66c4d831b075dab9 (diff) |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/script.cpp')
-rw-r--r-- | src/script.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script.cpp b/src/script.cpp index f5ca87ced8..0308177d44 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1,4 +1,5 @@ // 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. #include "headers.h" |