[med-svn] [gwama] 02/02: Merge tag 'upstream/2.2.2+dfsg'

[Dylan Aïssi]

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

bob.dybian-guest pushed a commit to branch master
in repository gwama.

commit 25d45237c858e988d42e39bbcf3c72545d8620a1
Merge: 19b4002 3d879d0
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Fri Aug 26 07:30:58 2016 +0200

    Merge tag 'upstream/2.2.2+dfsg'
    
    Upstream version 2.2.2+dfsg

 Makefile        |   2 +-
 commandLine.cpp |  52 ++++-
 global.cpp      |  40 ++--
 global.h        |  10 +
 readFile.cpp    | 688 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 readFile.h      |   2 +-
 6 files changed, 698 insertions(+), 96 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gwama.git