Merge branch 'master' into dev-modernize

This commit is contained in:
Martin Hořeňovský 2017-08-10 11:34:26 +02:00
commit aa42dd92d1
24 changed files with 281 additions and 42 deletions

View file

@ -101,6 +101,9 @@ namespace Catch {
std::ostream& cerr() {
return std::cerr;
}
std::ostream& clog() {
return std::clog;
}
#endif
}