summaryrefslogtreecommitdiff
path: root/libgo/go/old/netchan
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-12-07 12:13:23 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-12-07 12:13:23 +0000
commit007670eddc01d11ff1dcc4229c10c7755e48dca9 (patch)
tree0373601b01fbd7966bc4a6e634699aef2af18fbd /libgo/go/old/netchan
parentec6f02586a7b4bef66a49febd0b491471668d8f7 (diff)
downloadgcc-007670eddc01d11ff1dcc4229c10c7755e48dca9.tar.gz
2011-12-07 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 182077 using svnmerge git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@182079 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/old/netchan')
-rw-r--r--libgo/go/old/netchan/common.go2
-rw-r--r--libgo/go/old/netchan/export.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/old/netchan/common.go b/libgo/go/old/netchan/common.go
index 855b7175f7b..dfd1fd03427 100644
--- a/libgo/go/old/netchan/common.go
+++ b/libgo/go/old/netchan/common.go
@@ -5,8 +5,8 @@
package netchan
import (
+ "encoding/gob"
"errors"
- "gob"
"io"
"reflect"
"sync"
diff --git a/libgo/go/old/netchan/export.go b/libgo/go/old/netchan/export.go
index a4c4c6aeb59..d698dd53a90 100644
--- a/libgo/go/old/netchan/export.go
+++ b/libgo/go/old/netchan/export.go
@@ -23,8 +23,8 @@ package netchan
import (
"errors"
- "log"
"io"
+ "log"
"net"
"reflect"
"strconv"