[hamradio-commits] [uronode] 02/03: Merge tag 'upstream/2.6'

[Dave Hibberd]

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

hibby-guest pushed a commit to branch master
in repository uronode.

commit 374dc15bb0cd3ce686ace56248f2f6eb00c7dbf0
Merge: 0fff0b4 a3886f2
Author: Hibby <d at vehibberd.com>
Date:   Sat Jan 21 14:34:12 2017 +0000

    Merge tag 'upstream/2.6'
    
    Upstream version 2.6

 CHANGES.3            |  84 +++++++++++++++++++++++++++++++-
 Makefile.in          |   6 +--
 axdigi.c             |  19 ++++----
 cmdparse.c           |   3 +-
 command.c            |   5 +-
 config.c             |   2 +-
 configure            |  13 +++--
 etc/axdigi.conf      |  20 --------
 etc/help/jheard.hlp  |   9 ++++
 etc/help/jlong.hlp   |   8 +++
 etc/help/mheard.hlp  |   8 ---
 etc/uronode.conf     |   6 +--
 flexd.c              |  43 ++++++++++++-----
 gateway.c            |   2 +-
 mheard.c => jheard.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++--
 man/uronode.8        |  52 +++++++++++---------
 node.c               |   6 ++-
 node.h               |   9 ++--
 system.c             |   2 +-
 19 files changed, 334 insertions(+), 97 deletions(-)

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