eden-emu/Catch2
17
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev-modernize

Browse source 
Hopefully nothing went too wrong.
This commit is contained in:
Martin Hořeňovský 2017-06-05 17:19:42 +02:00
commit 7f6773bb4d
27 changed files with 264 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/internal/catch_fatal_condition.hpp
View file

@ -28,7 +28,7 @@ namespace Catch {
namespace Catch {
struct FatalConditionHandler {
void reset() {}
void reset() {}
};
}
@ -106,7 +106,7 @@ namespace Catch {
namespace Catch {
struct FatalConditionHandler {
void reset() {}
void reset() {}
};
}