merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-24 19:01:24 +00:00
parent ee2017d9ee
commit a2bb5c1feb
272 changed files with 4246 additions and 3800 deletions

View file

@ -22,17 +22,10 @@
#include <gtkmm2ext/doi.h>
#include "ardour/audioengine.h"
#include "ardour/mtdm.h"
#include "ardour/port_insert.h"
#include "ardour/session.h"
#include "ardour/io.h"
#include "ardour/audioengine.h"
#include "ardour/track.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/mtdm.h"
#include "ardour/data_type.h"
#include "ardour/port.h"
#include "ardour/bundle.h"
#include "port_insert_ui.h"
#include "utils.h"
@ -170,7 +163,7 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
{
set_name ("IOSelectorWindow");
string title = _("Port Insert ");
std::string title = _("Port Insert ");
title += pi->name();
set_title (title);