From 010d5e4c9a3d8d1428a81eb65159887473245a2b Mon Sep 17 00:00:00 2001 From: Lukasz Forynski Date: Tue, 17 Dec 2013 14:58:23 +0000 Subject: [PATCH] .. and missing '}' for last commit --- README.md | 2 +- include/internal/catch_default_main.hpp | 2 +- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 14a391d0..a621a74c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 25 (master branch)* +*v1.0 build 26 (master branch)* Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_default_main.hpp b/include/internal/catch_default_main.hpp index 672893b8..8baa9635 100644 --- a/include/internal/catch_default_main.hpp +++ b/include/internal/catch_default_main.hpp @@ -163,7 +163,7 @@ int main (int argc, char * const argv[]) { #endif return result; - +} #endif // __OBJC__ diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 2fcf72d1..90c54ce0 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 25, "master" ); + Version libraryVersion( 1, 0, 26, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index a3b0d798..5ff91cb4 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 25 (master branch) - * Generated: 2013-12-17 14:51:52.643587 + * CATCH v1.0 build 26 (master branch) + * Generated: 2013-12-17 14:56:48.216156 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -6166,7 +6166,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 25, "master" ); + Version libraryVersion( 1, 0, 26, "master" ); } // #included from: catch_text.hpp @@ -8057,6 +8057,7 @@ int main (int argc, char * const argv[]) { #endif return result; +} #endif // __OBJC__