Merged from develop branch

- now v1.3.0

README.md

@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.3.0-develop.4*
+*v1.3.0*
 
 Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
 

include/internal/catch_stream.hpp

@@ -96,8 +96,7 @@ namespace Catch {
         return m_os;
     }
 
-
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement this functions
     std::ostream& cout() {
         return std::cout;
     }

include/internal/catch_version.hpp

@@ -37,7 +37,7 @@ namespace Catch {
         return os;
     }
 
-    Version libraryVersion( 1, 3, 0, "develop", 4 );
+    Version libraryVersion( 1, 3, 0, "", 0 );
 
 }
 

projects/SelfTest/ExceptionTests.cpp

@@ -112,6 +112,7 @@ public:
     CustomStdException( const std::string& msg )
     : m_msg( msg )
     {}
+    ~CustomStdException() CATCH_NOEXCEPT {}
     
     std::string getMessage() const
     {

single_include/catch.hpp

@@ -1,6 +1,6 @@
 /*
- *  Catch v1.3.0-develop.4
+ *  Catch v1.3.0
- *  Generated: 2015-11-20 16:58:58.532767
+ *  Generated: 2015-12-04 10:18:17.055188
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -6627,7 +6627,7 @@ namespace Catch {
         return m_os;
     }
 
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement this functions
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
     std::ostream& cout() {
         return std::cout;
     }
@@ -7267,7 +7267,7 @@ namespace Catch {
         return os;
     }
 
-    Version libraryVersion( 1, 3, 0, "develop", 4 );
+    Version libraryVersion( 1, 3, 0, "", 0 );
 
 }