[qrouter] 01/03: Merge branch 'upstream'

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository qrouter.

commit 613a88b50da140f86bc2885969b1ee6bad238b7f
Merge: 09f4942 17b74e7
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Nov 16 18:49:43 2015 +0100

    Merge branch 'upstream'

 Makefile.in  |   9 +-
 VERSION      |   2 +-
 configure    |  25 +--
 configure.in |  22 ++-
 main.c       |   4 +-
 maze.c       | 128 ++++++++-------
 node.c       | 509 +++++++++++++++++++++++++++++++++++++++++++----------------
 node.h       |   3 +-
 qconfig.c    |   9 +-
 qconfig.h    |   2 +-
 qrouter.c    | 126 +++++++++++----
 qrouter.h    |   6 +-
 tclqrouter.c |  33 +++-
 13 files changed, 625 insertions(+), 253 deletions(-)

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