projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from 2.0-ongoing by hand, minus key binding editor
[ardour.git]
/
gtk2_ardour
/
marker_time_axis.cc
diff --git
a/gtk2_ardour/marker_time_axis.cc
b/gtk2_ardour/marker_time_axis.cc
index acb88257e06c54f266bb6f747aa0c54e8000895e..e10967d01a61778ed58f64695061afddc87ddaca 100644
(file)
--- a/
gtk2_ardour/marker_time_axis.cc
+++ b/
gtk2_ardour/marker_time_axis.cc
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <string>
*/
#include <string>
@@
-42,6
+41,7
@@
#include "i18n.h"
using namespace ARDOUR;
#include "i18n.h"
using namespace ARDOUR;
+using namespace PBD;
using namespace sigc;
using namespace Gtk;
using namespace sigc;
using namespace Gtk;