Merge branch 'master' into dev-modernize

2017-08-10 11:34:26 +02:00 · 2017-08-10 11:34:26 +02:00 · aa42dd92d1
commit aa42dd92d1
parent e658bacb04 7e4038d848
24 changed files with 281 additions and 42 deletions
--- a/include/internal/catch_stream.h
+++ b/include/internal/catch_stream.h
@ -20,6 +20,7 @@ namespace Catch {

    std::ostream& cout();
    std::ostream& cerr();
+    std::ostream& clog();


    struct IStream {