Merge branch 'master' into master

This commit is contained in:
Martin Hořeňovský authored and GitHub committed 2018-03-07 10:37:50 +01:00
commit 552589f25b
35 files changed
+255 -150

No files matched your search

+1 -1
View File
@@ -25,7 +25,7 @@ namespace Catch {
void showHelp() const;
void libIdentify();
int applyCommandLine( int argc, char* argv[] );
int applyCommandLine( int argc, char const * const * argv );
void useConfigData( ConfigData const& configData );