diff options
| author | Luke Dashjr <[email protected]> | 2012-02-07 22:49:03 -0500 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-02-07 22:49:03 -0500 |
| commit | a21e4da9012f87d2cb8b2c38517efda1999fab05 (patch) | |
| tree | fe813787f2d3647b2d220991932c8a1546981bd5 /src/serialize.h | |
| parent | Merge branch '0.5.0.x' into 0.5.x (diff) | |
| parent | Merge branch '0.4.x' into 0.5.0.x (diff) | |
| download | discoin-a21e4da9012f87d2cb8b2c38517efda1999fab05.tar.xz discoin-a21e4da9012f87d2cb8b2c38517efda1999fab05.zip | |
Merge branch '0.5.0.x' into 0.5.x
Conflicts:
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_zh_TW.ts
Diffstat (limited to 'src/serialize.h')
| -rw-r--r-- | src/serialize.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialize.h b/src/serialize.h index 79dd25aab..71f24f81d 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2011 The Bitcoin developers +// Copyright (c) 2009-2012 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. #ifndef BITCOIN_SERIALIZE_H |