Merge branch 'waveview_hacks' of https://github.com/nmains/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 18 Jul 2014 14:46:22 +0000 (10:46 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 18 Jul 2014 14:46:22 +0000 (10:46 -0400)

Trivial merge