summaryrefslogtreecommitdiff
path: root/libs/ardour/audiofilesource.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-07-01 09:46:18 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2014-07-01 09:46:18 -0400
commit23e7cf10191270d70357ccf0ed9294f020c7b7ab (patch)
treeddc1fc4d1914fe3de3de79c194c5dd859915bd2a /libs/ardour/audiofilesource.cc
parent4244ea65460b865f946551aace9b74191b26be4b (diff)
parentb660bc8ae92d19aedf0165815432b77a0c6170c4 (diff)
merge with master.
Manually resolved conflicts in import.cc and session.cc
Diffstat (limited to 'libs/ardour/audiofilesource.cc')
-rw-r--r--libs/ardour/audiofilesource.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 299b5a2bb5..7d34b9d9a5 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -36,6 +36,7 @@
#include "pbd/stl_delete.h"
#include "pbd/strsplit.h"
#include "pbd/shortpath.h"
+#include "pbd/stacktrace.h"
#include "pbd/enumwriter.h"
#include <sndfile.h>