1
0
Fork 0
mirror of https://github.com/fluffle/goirc synced 2025-05-13 11:03:19 +00:00

Merge branch 'master' into weekly

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

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"
)