final fixes for somewhat botched merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 8 Aug 2013 19:43:32 +0000 (15:43 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 8 Aug 2013 19:43:32 +0000 (15:43 -0400)
commitf7b140b9184a918c25aff82fb557d1ad51495230
treed7f9f01b9c61a28ee1f0a92e085b11a6b6abef1c
parent741154e6913114fdbc9c372e0e8bad76f40d36fb
final fixes for somewhat botched merge with master
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/level_meter.cc