Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts: rpc/api.go
Showing
- eth/backend.go 4 additions, 2 deletionseth/backend.go
- rpc/api.go 19 additions, 17 deletionsrpc/api.go
- rpc/args.go 53 additions, 16 deletionsrpc/args.go
- rpc/args_test.go 1 addition, 1 deletionrpc/args_test.go
- ui/qt/qwhisper/whisper.go 1 addition, 1 deletionui/qt/qwhisper/whisper.go
- whisper/envelope.go 3 additions, 0 deletionswhisper/envelope.go
- whisper/envelope_test.go 142 additions, 0 deletionswhisper/envelope_test.go
- whisper/filter.go 108 additions, 5 deletionswhisper/filter.go
- whisper/filter_test.go 199 additions, 0 deletionswhisper/filter_test.go
- whisper/message.go 16 additions, 7 deletionswhisper/message.go
- whisper/message_test.go 4 additions, 0 deletionswhisper/message_test.go
- whisper/peer.go 3 additions, 8 deletionswhisper/peer.go
- whisper/topic.go 71 additions, 8 deletionswhisper/topic.go
- whisper/topic_test.go 143 additions, 11 deletionswhisper/topic_test.go
- whisper/whisper.go 29 additions, 28 deletionswhisper/whisper.go
- whisper/whisper_test.go 1 addition, 1 deletionwhisper/whisper_test.go
- xeth/whisper.go 67 additions, 82 deletionsxeth/whisper.go
- xeth/whisper_filter.go 84 additions, 0 deletionsxeth/whisper_filter.go
- xeth/whisper_message.go 37 additions, 0 deletionsxeth/whisper_message.go
- xeth/xeth.go 39 additions, 29 deletionsxeth/xeth.go
Loading
Please register or sign in to comment