fix merge conflicts with master
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 23 Oct 2013 12:47:57 +0000 (08:47 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 23 Oct 2013 12:47:57 +0000 (08:47 -0400)
commitd135c4dc3a307d0be606f3afbbc8fd8c3ec56438
treedbedf6ddfe1c1b6557a885ad3b87455ba2213a12
parentfb313fb1741a04f270fff3703967df572ac4fc45
parent75271a17d8d4ed0003c4627e80a28feb68f5d9c9
fix merge conflicts with master
14 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/main.cc
gtk2_ardour/port_matrix.cc
gtk2_ardour/route_ui.cc
libs/ardour/ardour/session.h
libs/ardour/audioengine.cc
libs/ardour/lv2_plugin.cc
libs/ardour/route.cc
libs/ardour/session.cc
libs/ardour/session_state.cc
libs/ardour/wscript
wscript