summaryrefslogtreecommitdiff
path: root/src/encoding/encoding.go
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-12-05 20:34:45 -0500
committerRuss Cox <rsc@golang.org>2014-12-05 20:34:45 -0500
commit9ec47922b8593000b20bd3bac2db330a98229949 (patch)
treeedc89cf42f596da1464550c2e01605bfd826aa67 /src/encoding/encoding.go
parentf83565bc02ff8dbf9bb7d72a863f63c18361665d (diff)
parentffc214da93bb6958b83ded0eff1bd2de21e82431 (diff)
downloadgo-9ec47922b8593000b20bd3bac2db330a98229949.tar.gz
all: merge dev.garbage (d1238958d4ae) into default branch
When we start work on Gerrit, ppc64 and garbage collection work will continue in the master branch, not the dev branches. (We may still use dev branches for other things later, but these are ready to be merged, and doing it now, before moving to Git means we don't have to have dev branches working in the Gerrit workflow on day one.) TBR=rlh CC=golang-codereviews https://codereview.appspot.com/183140043
Diffstat (limited to 'src/encoding/encoding.go')
0 files changed, 0 insertions, 0 deletions