fix merge mixup after rebase from master
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 2 Feb 2016 15:15:24 +0000 (10:15 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 22 Feb 2016 20:31:25 +0000 (15:31 -0500)
commit4ed2cb67b7bd2a27bd007a89b732d187ec669908
treef0e50ec3a330635b9b1e55ce8ce24d14a9113b05
parentc932c562330f4611c14dd6846d6cd617507695db
fix merge mixup after rebase from master
gtk2_ardour/ardour_ui_ed.cc