mirror/goirc
1
0
Fork 0
mirror of https://github.com/fluffle/goirc synced 2025-05-12 18:44:50 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into weekly

Browse source 
Conflicts:
	client/connection.go  # MERGED
	event/registry.go     # DELETED
	logging/mock_test.go  # DELETED
This commit is contained in:
Alex Bramley 2011-11-13 14:13:55 +00:00
commit e0a5a57fe1
15 changed files with 10 additions and 1038 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/connection.go
View file

@ -5,11 +5,10 @@ import (
"crypto/tls"
"errors"
"fmt"
"github.com/fluffle/goirc/event"
"github.com/fluffle/goirc/logging"
"github.com/fluffle/goevent/event"
"github.com/fluffle/golog/logging"
"github.com/fluffle/goirc/state"
"net"
"strings"
"time"
)

4
client/connection_test.go
View file

@ -2,8 +2,8 @@ package client
import (
"bufio"
"github.com/fluffle/goirc/event"
"github.com/fluffle/goirc/logging"
"github.com/fluffle/goevent/event"
"github.com/fluffle/golog/logging"
"github.com/fluffle/goirc/state"
"gomock.googlecode.com/hg/gomock"
"testing"

2
client/handlers.go
View file

@ -4,7 +4,7 @@ package client
// to manage tracking an irc connection etc.
import (
"github.com/fluffle/goirc/event"
"github.com/fluffle/goevent/event"
"strings"
)

2
client/state_handlers.go
View file

@ -4,7 +4,7 @@ package client
// to manage tracking state for an IRC connection
import (
"github.com/fluffle/goirc/event"
"github.com/fluffle/goevent/event"
"strings"
)