projects / sdk / tools / heaptrack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39fbbc5 75bf1ff)
Merge branch '1.0'
authorMilian Wolff <mail@milianw.de>
Tue, 21 Feb 2017 07:57:02 +0000 (08:57 +0100)
committerMilian Wolff <mail@milianw.de>
Tue, 21 Feb 2017 07:57:02 +0000 (08:57 +0100)
 Conflicts:
src/analyze/gui/org.kde.heaptrack.appdata.xml
src/analyze/gui/org.kde.heaptrack.desktop


Trivial merge
Domain: SDK / Command line tools;