eden-emu/Catch2
15
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

2
include/internal/catch_xmlwriter.hpp
View file

@ -10,7 +10,6 @@
#include "catch_stream.h"
#include "catch_compiler_capabilities.h"
#include "catch_suppress_warnings.h"
#include <sstream>
#include <string>
@ -230,6 +229,5 @@ namespace Catch {
};
}
#include "catch_reenable_warnings.h"
#endif // TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED