[Forensics-changes] [libguytools] 02/07: Merge tag 'upstream/2.0.3' into debian

[Michael Prokop]

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

mika pushed a commit to branch debian
in repository libguytools.

commit ff5e8700327e6a898894b5d3fb75037542e94256
Merge: 35928a3 9468d10
Author: Michael Prokop <mika at debian.org>
Date:   Thu Apr 30 17:17:14 2015 +0200

    Merge tag 'upstream/2.0.3' into debian
    
    Upstream version 2.0.3
    
    Conflicts:
    	toolsysinfo.cpp

 COPYING                 | 339 ++++++++++++++++++++++++++++++++++++++++++++++++
 changelog               |  48 +++++++
 create_version_file.sh  |   2 +-
 include/toolcfg.h       |  17 +++
 include/toolconstants.h |  17 +++
 include/toolerror.h     |  18 ++-
 include/toolglobalid.h  |  21 ++-
 include/toollog.h       |  17 +++
 include/toolsignal.h    |  17 +++
 include/toolsysinfo.h   |  17 +++
 include/tooltypes.h     |  16 +++
 toolcfg.cpp             |  56 +++++---
 toolerror.cpp           |  17 +++
 toollog.cpp             |  16 +++
 toolsignal.cpp          |  23 +++-
 toolsysinfo.cpp         |  18 ++-
 16 files changed, 631 insertions(+), 28 deletions(-)

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