diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-07 22:49:03 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-07 22:49:03 -0500 |
| commit | a21e4da9012f87d2cb8b2c38517efda1999fab05 (patch) | |
| tree | fe813787f2d3647b2d220991932c8a1546981bd5 /src/net.h | |
| parent | 06e0f79ae5a4c2c7b3c8232c4544307d4d4940a5 (diff) | |
| parent | b5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07 (diff) | |
| download | bitcoin-a21e4da9012f87d2cb8b2c38517efda1999fab05.tar.xz | |
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/net.h')
| -rw-r--r-- | src/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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_NET_H |