[qrouter] 01/05: Merge tag '1.3.7'

[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 dffc34d521284614f85dca45c49be177c350bbd3
Merge: babe498 58af34c
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Feb 20 18:31:58 2015 +0100

    Merge tag '1.3.7'
    
    Conflicts:
    	VERSION

 Makefile      | 127 --------
 VERSION       |   2 +-
 config.log    | 428 --------------------------
 config.status | 951 ----------------------------------------------------------
 graphics.c    |   2 +-
 maze.c        |  31 +-
 node.c        |  67 ++++-
 qrouter.c     |  50 ++-
 qrouter.h     |   1 +
 9 files changed, 113 insertions(+), 1546 deletions(-)

diff --cc VERSION
index 31e5c84,80e78df..3336003
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 1.3.3
 -1.3.5
++1.3.7

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