[SCM] gammaray packaging branch, master, updated. debian/1.3.0-1-5-g34a5987
Jakub Adam
xhaakon-guest at alioth.debian.org
Wed May 1 11:45:58 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=d059191
The following commit has been merged in the master branch:
commit d0591914ae00682ebd115b9d9da76b819874e96a
Merge: 9adfee6e6e647df4434b4a3503ee60c7f5c3a8a8 685f367cdb6b45eb4e832ca453642458ebfa8206
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Wed May 1 12:57:02 2013 +0200
Merge tag 'upstream/1.3.1'
Upstream version 1.3.1
3rdparty/qt/resourcemodel.h | 4 -
CHANGES | 9 ++
CMakeLists.txt | 12 ++-
cmake/FindGraphviz.cmake | 102 +++++++++++--------
core/CMakeLists.txt | 1 +
core/metaobjecttreemodel.cpp | 46 ++++++++-
core/propertyeditor/propertyeditorfactory.cpp | 4 +
core/propertyeditor/propertyeditorfactory.h | 5 +
core/tools/mimetypes/mimetypes.cpp | 109 +-------------------
core/tools/mimetypes/mimetypes.h | 10 +--
.../{mimetypes.cpp => mimetypesmodel.cpp} | 99 ++++++++++--------
core/tools/mimetypes/mimetypesmodel.h | 60 +++++++++++
core/tools/modelinspector/modelcellmodel.cpp | 5 +-
core/tools/modelinspector/modelinspectorwidget.cpp | 24 ++++-
core/tools/modelinspector/modelinspectorwidget.h | 3 +-
core/tools/standardpaths/standardpathsmodel.h | 8 +-
core/tools/widgetinspector/CMakeLists.txt | 8 ++-
debian.changelog | 6 +
gammaray.dsc | 4 +-
gammaray.spec | 6 +-
launcher/injector/interactiveprocess.cpp | 2 +-
launcher/processfiltermodel.cpp | 2 +-
plugins/statemachineviewer/gvgraph/gvgraph.h | 6 +-
plugins/statemachineviewer/statemachineviewer.cpp | 33 +++++-
tests/attachhelper.cpp | 3 +
25 files changed, 336 insertions(+), 235 deletions(-)
--
gammaray packaging
More information about the pkg-kde-commits
mailing list