mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-10 00:34:59 +01:00
merge with master and fix 2 conflicts
This commit is contained in:
commit
e5888d3983
107 changed files with 7557 additions and 6246 deletions
|
|
@ -104,6 +104,12 @@ PBD::stacktrace (std::ostream& out, int levels)
|
|||
|
||||
#else
|
||||
|
||||
std::string
|
||||
demangle (std::string const & l)
|
||||
{
|
||||
return std::string();
|
||||
}
|
||||
|
||||
void
|
||||
PBD::stacktrace (std::ostream& out, int /*levels*/)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue