Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

This commit is contained in:
Paul Davis 2014-01-10 16:07:57 -05:00
commit 3020b224fa
466 changed files with 10821 additions and 1674 deletions

View file

@ -22,6 +22,7 @@
#include "pbd/stacktrace.h"
#include <cstdio>
#include <iostream>
#include <string>
void
PBD::trace_twb ()
@ -105,7 +106,7 @@ PBD::stacktrace (std::ostream& out, int levels)
#else
std::string
PBD::demangle (std::string const & l)
PBD::demangle (std::string const & l) /* JE - !!!! 'PBD' namespace might possibly get removed (except it's still used in 'libs/canvas/item.cc') */
{
return std::string();
}