fix merge conflicts from master

[ardour.git] / gtk2_ardour / midi_tracer.cc

diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc
index 073fd9cc15a86870ccb373ec5d1fe025a64b2b27..c4fe76252b32a1f8b957267d4ec0348d2c9bc0ca 100644 (file)
--- a/gtk2_ardour/midi_tracer.cc
+++ b/gtk2_ardour/midi_tracer.cc
@@ -23,6 +23,9 @@
 #include <sys/time.h>
 #include <time.h>
 
+#include "pbd/localtime_r.h"
+#include "pbd/timersub.h"
+
 #include "midi++/parser.h"
 #include "midi++/manager.h"