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)
commit08bdda7b322c97566c7de81fc95b012af9a0bd29
tree9d03577fe756df6af67f705c4eaf40462b17b033
parent39fbbc5190f8a6f6c3b314a0de52ed60fb6c0595
parent75bf1ffbd34ab2755046dede8031bcdfa2c372c9
Merge branch '1.0'

 Conflicts:
src/analyze/gui/org.kde.heaptrack.appdata.xml
src/analyze/gui/org.kde.heaptrack.desktop