merge with master and fix 2 conflicts

This commit is contained in:
Paul Davis 2013-10-16 22:06:56 -04:00
commit e5888d3983
107 changed files with 7557 additions and 6246 deletions

View file

@ -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*/)
{