[SCM] gammaray packaging branch, master, updated. upstream/1.2.1-42-g5a8ac5f

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=98d6df5

The following commit has been merged in the master branch:
commit 98d6df5b94590da2d16351cd2fd1b39a9c28eee3
Merge: a13d758925a4bc312925ad2b68f7037ac1b9ca9b a079034cf188ee9cf8ff1f2be56407d21dc5579a
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Aug 20 18:58:53 2012 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 3rdparty/qt/private/qguiplatformplugin_p.h     |  126 ++++++++++++++++++++++++
 3rdparty/qt/private/qobject_p.h                |   59 +++++++++++
 CMakeLists.txt                                 |   32 +++++--
 cmake/FindGraphviz.cmake                       |  121 ++++++++++++++++-------
 core/CMakeLists.txt                            |    2 +
 core/mainwindow.ui                             |    6 +-
 core/objecttreemodel.cpp                       |   31 ++++--
 core/probe.cpp                                 |   14 +++
 core/probe.h                                   |    1 +
 core/util.cpp                                  |    7 ++
 debian.changelog                               |    6 +
 gammaray.dsc                                   |    4 +-
 gammaray.spec                                  |    4 +-
 launcher/injector/CMakeLists.txt               |    2 +-
 launcher/probefinder.cpp                       |    2 +-
 plugins/CMakeLists.txt                         |    6 +-
 plugins/objectvisualizer/CMakeLists.txt        |    5 +
 plugins/statemachineviewer/gvgraph/gvgraph.cpp |   11 ++-
 plugins/statemachineviewer/gvgraph/gvutils.h   |    2 +-
 plugins/timertop/timermodel.cpp                |    5 +-
 20 files changed, 381 insertions(+), 65 deletions(-)

-- 
gammaray packaging