Merge branch 'wip/diffing'
authorMilian Wolff <mail@milianw.de>
Fri, 17 Jun 2016 16:28:00 +0000 (18:28 +0200)
committerMilian Wolff <mail@milianw.de>
Fri, 17 Jun 2016 16:28:00 +0000 (18:28 +0200)
1  2 
gui/flamegraph.cpp

Simple merge