[Forensics-changes] [guymager] 02/06: Merge branch 'upstream' into debian

Michael Prokop mika at moszumanska.debian.org
Thu Jun 18 15:08:05 UTC 2015


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

mika pushed a commit to branch debian
in repository guymager.

commit ad98710cd3862ace37360ebde2b29e13e06a2402
Merge: bb374ed 0a7ce1f
Author: Michael Prokop <mika at debian.org>
Date:   Thu Jun 18 15:49:07 2015 +0200

    Merge branch 'upstream' into debian
    
    Conflicts:
    	changelog
    	device.cpp
    	dlgacquire.cpp
    	fifo.h
    	guymager.cfg
    	guymager.pro
    	main.cpp
    	table.cpp
    	util.cpp
    	util.h

 changelog               | 159 ++++++++++++++++++++++++++----------------------
 config.cpp              |   3 +-
 config.h                |   3 +
 device.cpp              |   8 ++-
 dlgacquire.cpp          |   7 ++-
 fifo.h                  |   2 +-
 guymager.cfg            |   9 ++-
 guymager.pro            |   8 +--
 main.cpp                |   2 +-
 manuals/guymager_body.1 |   2 +-
 table.cpp               |  32 ++++++++--
 util.cpp                |  46 ++++++++++++++
 util.h                  |  16 +++++
 13 files changed, 204 insertions(+), 93 deletions(-)

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



More information about the forensics-changes mailing list