[timblserver] 74/76: Merge tag 'upstream/1.7'

[Joost van Baal]

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

joostvb pushed a commit to branch master
in repository timblserver.

commit 97bffe721c26609f5d7b90118050320ad0fe4863
Merge: 17a6c1e 39a46ee
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Wed Sep 3 18:59:34 2014 +0200

    Merge tag 'upstream/1.7'
    
    Upstream version 1.7

 ChangeLog                            | 138 ++++++
 Makefile.in                          |  87 ++--
 NEWS                                 |  16 +-
 README                               |   2 +-
 aclocal.m4                           |  70 ++-
 bootstrap                            |   4 +-
 config.guess                         |  49 ++-
 config.h.in                          |  62 +--
 config.sub                           |  65 +--
 configure                            | 826 ++++++++++++++---------------------
 configure.ac                         | 106 ++---
 demos/Makefile.in                    |  36 +-
 demos/sockettestClient.cxx           |   6 +-
 demos/sockettestServer.cxx           |   6 +-
 depcomp                              |  74 +++-
 docs/Makefile.in                     |  42 +-
 docs/timblserver.1                   |   6 +-
 include/Makefile.in                  |  32 +-
 include/timblserver/ClientBase.h     |   6 +-
 include/timblserver/FdStream.h       |   4 +-
 include/timblserver/Makefile.in      |  42 +-
 include/timblserver/ServerBase.h     |   8 +-
 include/timblserver/SocketBasics.h   |   4 +-
 include/timblserver/TimblServerAPI.h |   4 +-
 ltmain.sh                            |  95 ++--
 m4/Makefile.in                       |  32 +-
 m4/ax_lib_socket_nsl.m4              |  40 ++
 m4/ax_type_socklen_t.m4              |  61 +++
 m4/ltversion.m4                      |  10 +-
 missing                              |  53 +--
 src/ClientBase.cxx                   |  11 +-
 src/FdStream.cxx                     |   4 +-
 src/Makefile.am                      |   4 +-
 src/Makefile.in                      |  48 +-
 src/ServerBase.cxx                   |  26 +-
 src/SocketBasics.cxx                 |  28 +-
 src/TimblClient.cxx                  |   4 +-
 src/TimblServer.cxx                  |  12 +-
 src/TimblServerAPI.cxx               |   4 +-
 39 files changed, 1157 insertions(+), 970 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/timblserver.git