diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-07 22:46:07 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-07 22:46:07 -0500 |
| commit | b5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07 (patch) | |
| tree | fd1969416f825823b2a1262353c731b756929b2a /doc | |
| parent | 4bbd72cca108042cdffee74d10fcc7a540da2b51 (diff) | |
| parent | 4664aae3fe2eba4eec84d20f1e7e701ceeeb49bd (diff) | |
| download | bitcoin-b5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Conflicts:
src/bitcoinrpc.cpp
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README | 2 | ||||
| -rw-r--r-- | doc/README_windows.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/README b/doc/README index e3b8ffb3b9..6af11c3497 100644 --- a/doc/README +++ b/doc/README @@ -1,6 +1,6 @@ Bitcoin 0.5.0.4 BETA -Copyright (c) 2009-2011 Bitcoin Developers +Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in diff --git a/doc/README_windows.txt b/doc/README_windows.txt index b117f51208..25cb069266 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,6 +1,6 @@ Bitcoin 0.5.0.4 BETA
-Copyright (c) 2009-2011 Bitcoin Developers
+Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file license.txt or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
|