Merge branch 'master' into dev-modernize

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

View File

@@ -20,6 +20,7 @@ namespace Catch {
std::ostream& cout();
std::ostream& cerr();
std::ostream& clog();
struct IStream {