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

2
state/channel.go
View file

@ -2,7 +2,7 @@ package state
import (
"fmt"
"github.com/fluffle/goirc/logging"
"github.com/fluffle/golog/logging"
"reflect"
"strconv"
)

2
state/nick.go
View file

@ -1,7 +1,7 @@
package state
import (
"github.com/fluffle/goirc/logging"
"github.com/fluffle/golog/logging"
"reflect"
)

2
state/tracker.go
View file

@ -1,7 +1,7 @@
package state
import (
"github.com/fluffle/goirc/logging"
"github.com/fluffle/golog/logging"
)
// The state manager interface

2
state/tracker_test.go
View file

@ -1,7 +1,7 @@
package state
import (
"github.com/fluffle/goirc/logging"
"github.com/fluffle/golog/logging"
"gomock.googlecode.com/hg/gomock"
"testing"
)