[SCM] gammaray packaging branch, master, updated. debian/1.2.1-2-9-g5a8bd1a

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 61a55632c90efef2f75d9be452248e975f477ecb
Merge: cb7380806c58849ebbe17c8449f149a5f796509c 103ed91d9c44d51f35559bb12b2416d8b3fc6438
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Dec 21 22:38:15 2012 +0100

    Merge tag 'upstream/1.2.2'
    
    Upstream version 1.2.2

 CMakeLists.txt                                 |    5 ++++-
 cmake/FindGraphviz.cmake                       |   12 +++++++++---
 config-gammaray.h.cmake                        |    1 +
 core/CMakeLists.txt                            |   15 ++++++++++-----
 core/hooking/abstractfunctionoverwriter.h      |    4 ++++
 core/hooking/unixfunctionoverwriter.h          |    2 +-
 core/mainwindow.cpp                            |    7 +++++--
 core/probe.cpp                                 |    2 ++
 core/tools/widgetinspector/widgetinspector.cpp |    9 +++++++++
 core/tools/widgetinspector/widgetinspector.h   |    2 ++
 core/tools/widgetinspector/widgettreemodel.cpp |    3 ++-
 debian.changelog                               |    6 ++++++
 gammaray.dsc                                   |    4 ++--
 gammaray.pod                                   |    2 ++
 gammaray.spec                                  |    4 +++-
 launcher/launcherwindow.cpp                    |    2 ++
 launcher/launcherwindow.ui                     |    8 ++++----
 launcher/processfiltermodel.cpp                |    7 ++++++-
 plugins/objectvisualizer/CMakeLists.txt        |    1 +
 plugins/timertop/functioncalltimer.cpp         |    2 +-
 20 files changed, 76 insertions(+), 22 deletions(-)

-- 
gammaray packaging