diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-27 19:10:41 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-27 19:10:41 +0000 |
| commit | d31e24aeaaf18a4117f23a937614a8bf2679e8a4 (patch) | |
| tree | 30852ed3e4aa86d63deef2c47d9090866381dcfa /doc | |
| parent | e1c2163fb7b3f37932be9093cadd6cce250844a5 (diff) | |
| parent | b9b15578bb52a7a7394fd1ef497f186c5c950cb1 (diff) | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
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 5fd4171b9c..07e480e7a8 100644 --- a/doc/README +++ b/doc/README @@ -1,4 +1,4 @@ -Bitcoin 0.5.6 BETA +Bitcoin 0.5.7 BETA Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying diff --git a/doc/README_windows.txt b/doc/README_windows.txt index fcb88bb473..bcb334b2fe 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.5.6 BETA
+Bitcoin 0.5.7 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
|