Merge remote-tracking branch 'origin/master'

Conflicts:
	ethereumj-core/src/main/java/org/ethereum/net/p2p/P2pMessageCodes.java
This commit is contained in:
romanman 2014-11-16 14:20:10 -05:00
commit 603f199229
1 changed files with 1 additions and 1 deletions

View File

@ -9,7 +9,7 @@ import java.util.Map;
* The codes for these commands are the first byte in every packet. * The codes for these commands are the first byte in every packet.
* ÐΞV * ÐΞV
* @see <a href="https://github.com/ethereum/wiki/wiki/%C3%90%CE%9EVp2p-Wire-Protocol"> * @see <a href="https://github.com/ethereum/wiki/wiki/%C3%90%CE%9EVp2p-Wire-Protocol">
* https://github.com/ethereum/wiki/wiki/%C3%90%CE%9EVp2p-Wire-Protocol</a> * https://github.com/ethereum/wiki/wiki/ÐΞVp2p-Wire-Protocol</a>
*/ */
public enum P2pMessageCodes { public enum P2pMessageCodes {