Merge branch 'master' into develop

e8b45852 · obscuren · 6ba534af · 6ef28320 · e8b45852
Commit e8b45852 authored May 20, 2014 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

peer.go peer.go +1 -1

No files found.
--- a/peer.go
+++ b/peer.go
@@ -18,7 +18,7 @@ const (
 	// The size of the output buffer for writing messages
 	outputBufferSize = 50
 	// Current protocol version
-	ProtocolVersion = 11
+	ProtocolVersion = 12
 )

 type DiscReason byte