review.tizen.org Git - sdk/tools/heaptrack.git/commit

projects / sdk / tools / heaptrack.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d9cb5c7 0e0d481)

author	Milian Wolff <mail@milianw.de>
	Sun, 5 Mar 2017 23:42:21 +0000 (00:42 +0100)
committer	Milian Wolff <mail@milianw.de>
	Sun, 5 Mar 2017 23:42:21 +0000 (00:42 +0100)
commit	4d82c36360fbc88638a254ec829c4afcaedcc0fe
tree	ec75a7d0242114c4fd5bac7370bd5196f807a86d	tree \| snapshot
parent	d9cb5c72a2e01b4e2d5dc9e4c934b581bd63032d	commit \| diff
parent	0e0d481c7177337511fa1ec70d4515a8c6b9303e	commit \| diff

Merge branch '1.0'

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

Domain: SDK / Command line tools;