Merge remote-tracking branch 'upstream/master' master
authorKevin Funk <kevin.funk@kdab.com>
Wed, 11 May 2011 13:21:39 +0000 (15:21 +0200)
committerKevin Funk <kevin.funk@kdab.com>
Wed, 11 May 2011 13:21:39 +0000 (15:21 +0200)
commit342059f8e19d81b925a31a4f2cea240c932bc6e0
tree191cc943d88de3b6eaa6315f267172dd855df036
parent93ddc2529b3632d8033b3921a4d8c83878973842
parentc450abfe3f2f80cc6d3a0740cd1906a2952da5c4
Merge remote-tracking branch 'upstream/master'

Conflicts:
src/libs/valgrind/callgrind/callgrindfunction.cpp
src/libs/valgrind/callgrind/callgrindfunctioncycle.cpp
src/libs/valgrind/callgrind/callgrindparser.cpp
src/plugins/callgrind/callgrindsettings.cpp
src/plugins/memcheck/memchecksettings.cpp
13 files changed:
src/libs/valgrind/callgrind/callgrindcontroller.cpp
src/libs/valgrind/callgrind/callgrindfunction.cpp
src/libs/valgrind/callgrind/callgrindfunctioncycle.cpp
src/libs/valgrind/callgrind/callgrindparser.cpp
src/plugins/callgrind/callgrindcostdelegate.cpp
src/plugins/callgrind/callgrindsettings.cpp
src/plugins/callgrind/callgrindsettings.h
src/plugins/callgrind/callgrindtool.cpp
src/plugins/callgrind/callgrindvisualisation.cpp
src/plugins/callgrind/callgrindvisualisation.h
src/plugins/callgrind/callgrindwidgethandler.cpp
src/plugins/callgrind/callgrindwidgethandler.h
src/plugins/memcheck/memchecksettings.cpp