[Pkg-octave-commit] [octave-sockets] 01/04: Merge tag 'upstream/1.2.0'

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository octave-sockets.

commit 1920cc832c9bd286590c0ce5896b0d1070dfb796
Merge: e5a7902 38e1ef8
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 1 09:12:37 2015 -0300

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 DESCRIPTION             |   7 +-
 INDEX                   |   2 +-
 NEWS                    |  14 +
 src/Makefile            |  46 ++-
 src/socket.cc           | 779 +++++++++++++++++++++++++++++++++++++++++
 src/sockets.cc          | 897 ------------------------------------------------
 src/test_octave_sockets |  96 ------
 7 files changed, 828 insertions(+), 1013 deletions(-)

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-sockets.git