Merge branch 'master' into dev-modernize

Hopefully nothing went too wrong.
2017-06-05 17:19:42 +02:00
parent b459bb4c43 3e018ef131
commit 7f6773bb4d
27 changed files with 264 additions and 52 deletions
@@ -104,7 +104,7 @@ namespace Catch {
    namespace Matchers {
        namespace Impl {
        namespace NSStringMatchers {
-           
+
            struct StringHolder : MatcherBase<NSString*>{
                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}