Merge commit 'bedbfc2'

Conflicts:
	client.go
This commit is contained in:
raylu 2010-12-18 17:36:01 -08:00
commit d9267067cd
6 changed files with 6 additions and 6 deletions

View File

@ -4,7 +4,7 @@
include $(GOROOT)/src/Make.inc include $(GOROOT)/src/Make.inc
TARG=irc TARG=github.com/fluffle/goirc/client
GOFILES=\ GOFILES=\
connection.go\ connection.go\
commands.go\ commands.go\

View File

@ -1,4 +1,4 @@
package irc package client
import "strings" import "strings"

View File

@ -1,4 +1,4 @@
package irc package client
import ( import (
"bufio" "bufio"

View File

@ -1,4 +1,4 @@
package irc package client
// this file contains the basic set of event handlers // this file contains the basic set of event handlers
// to manage tracking an irc connection etc. // to manage tracking an irc connection etc.

View File

@ -1,4 +1,4 @@
package irc package client
import ( import (
"testing" "testing"

View File

@ -1,4 +1,4 @@
package irc package client
// Here you'll find the Channel and Nick structs // Here you'll find the Channel and Nick structs
// as well as the internal state maintenance code for the handlers // as well as the internal state maintenance code for the handlers