]> rtime.felk.cvut.cz Git - linux-conf-perf.git/commit
Merge branch 'measuring'
authorKarel Kočí <cynerd@email.cz>
Thu, 13 Aug 2015 13:53:06 +0000 (15:53 +0200)
committerKarel Kočí <cynerd@email.cz>
Thu, 13 Aug 2015 13:53:06 +0000 (15:53 +0200)
commitb6abf4e8fe0c3b40305dfdd0410abfbf3c804874
tree0e63a8695c793e79ba1b64b6674002c02f514040
parenta8c91e078ccb3780a53748cc52b7974bfc65b636
parent72316e351df5159384d70faa708224ff2fcc8dd2
Merge branch 'measuring'

Removing measuring branch. Idea was to make measuring configuration
separate from master. But keeping changes in master and measuring
branch consistent was pain.