smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'windows' into windows+cc

Browse source 
Conflicts (hopefully resolved):
	libs/pbd/stacktrace.cc
This commit is contained in:
John Emmas 2013-10-15 17:38:08 +01:00
commit 97c68cc2b1
8 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/pbd/stacktrace.cc
View file

@ -106,10 +106,9 @@ PBD::stacktrace (std::ostream& out, int levels)
#else
std::string
PBD::demangle (std::string const & l)
demangle (std::string const & l)
{
std::string empty_string;
return empty_string;
return std::string();
}
void