From e6b365dc8cdc40b9f7875450765d8aa26fa178f9 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Tue, 7 Jul 2015 08:25:15 +0100
Subject: [PATCH] dev build 5

---
 README.md                          |  2 +-
 include/internal/catch_version.hpp |  2 +-
 single_include/catch.hpp           | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 6c46344f..2d0e2a8a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.2.1-develop.4*
+*v1.2.1-develop.5*
 
 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_version.hpp b/include/internal/catch_version.hpp
index a3cac3f6..015ebdf2 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -37,7 +37,7 @@ namespace Catch {
         return os;
     }
 
-    Version libraryVersion( 1, 2, 1, "develop", 4 );
+    Version libraryVersion( 1, 2, 1, "develop", 5 );
 
 }
 
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 05bf3471..c42c72df 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  Catch v1.2.1-develop.4
- *  Generated: 2015-07-06 06:21:18.816844
+ *  Catch v1.2.1-develop.5
+ *  Generated: 2015-07-07 08:24:50.226161
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -4279,6 +4279,10 @@ namespace Catch {
             .describe( "load test names to run from a file" )
             .bind( &loadTestNamesFromFile, "filename" );
 
+        cli["-#"]["--filenames-as-tags"]
+            .describe( "adds a tag for the filename" )
+            .bind( &ConfigData::filenamesAsTags );
+
         // Less common commands which don't have a short form
         cli["--list-test-names-only"]
             .describe( "list all/matching test cases names only" )
@@ -4300,10 +4304,6 @@ namespace Catch {
             .describe( "force colourised output" )
             .bind( &ConfigData::forceColour );
 
-        cli["--filenames-as-tags"]
-            .describe( "adds a tag for the filename" )
-            .bind( &ConfigData::filenamesAsTags );
-
         return cli;
     }
 
@@ -5626,7 +5626,7 @@ namespace Catch {
             if( lastDot != std::string::npos )
                 filename = filename.substr( 0, lastDot );
 
-            tags.insert( "@" + filename );
+            tags.insert( "#" + filename );
             setTags( test, tags );
         }
     }
@@ -6823,7 +6823,7 @@ namespace Catch {
         return os;
     }
 
-    Version libraryVersion( 1, 2, 1, "develop", 4 );
+    Version libraryVersion( 1, 2, 1, "develop", 5 );
 
 }