[Pkg-golang-commits] [golang] 02/03: Merge tag 'upstream/1.2.1' into debian-sid

[Michael Stapelberg]

This is an automated email from the git hooks/post-receive script.

stapelberg pushed a commit to branch debian-sid
in repository golang.

commit 9c01ffca14473c5eb84b73e9cafdfcae46505aea
Merge: f3bac4d c8bf49e
Author: Michael Stapelberg <stapelberg at debian.org>
Date:   Mon Mar 3 17:40:28 2014 +0100

    Merge tag 'upstream/1.2.1' into debian-sid
    
    Upstream version 1.2.1

 VERSION                           |   2 +-
 doc/devel/release.html            |   6 ++
 doc/install.html                  |   2 +-
 src/pkg/database/sql/sql.go       |   4 +-
 src/pkg/database/sql/sql_test.go  |  23 ++++++
 src/pkg/net/fd_windows.go         |  48 ++++++++++---
 src/pkg/net/net_windows_test.go   | 146 ++++++++++++++++++++++++++++++++++++++
 src/pkg/runtime/mgc0.c            |   5 +-
 src/pkg/runtime/mprof.goc         |   4 +-
 src/pkg/runtime/proc.c            |   4 +-
 src/pkg/runtime/sys_x86.c         |  13 ++++
 src/pkg/runtime/traceback_arm.c   |  12 ++++
 src/pkg/runtime/traceback_x86.c   |  10 +++
 src/pkg/syscall/ztypes_windows.go |   2 +
 14 files changed, 264 insertions(+), 17 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git