From aaea166135ace01709f7e0be64f40be80f4107ec Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 4 Apr 2013 00:32:52 -0400 Subject: initial commit of hand merging, plus getting "ancient" waf script to work correctly --- gtk2_ardour/audio_time_axis.h | 1 - 1 file changed, 1 deletion(-) (limited to 'gtk2_ardour/audio_time_axis.h') diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h index 8a5b6ab0ac..5790080160 100644 --- a/gtk2_ardour/audio_time_axis.h +++ b/gtk2_ardour/audio_time_axis.h @@ -38,7 +38,6 @@ #include "enums.h" #include "editing.h" #include "route_time_axis.h" -#include "canvas.h" namespace ARDOUR { class Session; -- cgit v1.2.3