[Pkg-octave-commit] [octave-communications] 01/01: Merge tag 'upstream/1.2.1'

[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-communications.

commit b9cadee0d3a7951d6120c7f0e44801535300c3bd
Merge: ecd6ac3 97b956e
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Mon Apr 20 11:58:23 2015 -0300

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    Conflicts:
    	DESCRIPTION
    	NEWS
    	doc/Makefile
    	inst/qfunc.m
    	src/Makefile
    	src/configure
    	src/cyclpoly.cc
    	src/gf.cc
    	src/op-gm-gm.cc
    	src/ov-galois.cc

 DESCRIPTION         |    6 +-
 NEWS                |    5 +
 doc/Makefile        |    1 +
 inst/qfunc.m        |    3 +-
 src/Makefile.in     |   70 +
 src/__errcore__.cc  |    4 -
 src/__gfweight__.cc |    5 -
 src/configure       | 3754 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/configure.ac    |  103 ++
 src/cyclgen.cc      |    6 +-
 src/cyclpoly.cc     |    5 +-
 src/galois-def.cc   |    1 -
 src/galois.cc       |    5 +-
 src/galois.h        |   24 +-
 src/galoisfield.cc  |    1 -
 src/galoisfield.h   |    7 +-
 src/genqamdemod.cc  |    1 -
 src/gf.cc           |   30 +-
 src/isprimitive.cc  |    3 -
 src/op-gm-gm.cc     |    7 +-
 src/op-gm-m.cc      |    5 +-
 src/op-gm-s.cc      |    5 +-
 src/op-m-gm.cc      |    5 +-
 src/op-s-gm.cc      |    5 +-
 src/ov-galois.cc    |   53 +-
 src/ov-galois.h     |   27 +-
 src/primpoly.cc     |    5 +-
 src/syndtable.cc    |    4 -
 28 files changed, 4057 insertions(+), 93 deletions(-)

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