diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
| commit | 2a6a16f980ff9181b138f7a30aedfbde4426a591 (patch) | |
| tree | d86752508bbd033be18301796e7d0c571a4fe1c0 /libs/pbd | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | 465b800d8b7dc0d9e0f92a16c6fcae29d2bbd544 (diff) | |
merge with master, fixing conflicts in 3 wscript files
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/stacktrace.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc index 805b9a2e84..b78f0e9338 100644 --- a/libs/pbd/stacktrace.cc +++ b/libs/pbd/stacktrace.cc @@ -96,6 +96,12 @@ PBD::stacktrace (std::ostream& out, int levels) #else +std::string +PBD::demangle (std::string const & l) +{ + return string; +} + void PBD::stacktrace (std::ostream& out, int /*levels*/) { |