Merge branch 'master' into windows+cc

Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
This commit is contained in:
John Emmas 2013-10-14 19:31:22 +01:00
commit e466ce40ad
51 changed files with 1819 additions and 1369 deletions

View file

@ -159,6 +159,7 @@ PluginUIWindow::PluginUIWindow (
PluginUIWindow::~PluginUIWindow ()
{
cerr << "PluginWindow deleted for " << this << endl;
delete _pluginui;
}
@ -403,8 +404,6 @@ PluginUIWindow::plugin_going_away ()
}
death_connection.disconnect ();
delete_when_idle (this);
}
PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)