fix merge issues with master
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 14 Aug 2013 17:10:59 +0000 (13:10 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 14 Aug 2013 17:10:59 +0000 (13:10 -0400)
commit6bcdf4f0f106d0b83ed7f221f546c132585e19e7
tree1ebbd4c6a63943952cd9b4ec6a7adcc8ad506883
parente711dfae12a3922476f5ff39c6b015d6617ed16c
parent7a431f892ec6e7e2283885c474b680081c983762
fix merge issues with master
gtk2_ardour/ardour_ui.cc
gtk2_ardour/main.cc
libs/ardour/ardour/ardour.h
libs/ardour/globals.cc
libs/ardour/lv2_plugin.cc