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 /src/net.h | |
| 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 '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 |