[lmi-commits] [lmi] odd/multiarch daec463 2/5: Merge remote-tracking branch 'origin/master' into odd/multiarch

[Greg Chicares]

branch: odd/multiarch
commit daec463274094e8da72bf6551b3ee28ff4ac021a
Merge: 2651914 a772a54
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Merge remote-tracking branch 'origin/master' into odd/multiarch
    
    Incorporated the last couple of commits to master.
---
 test_coding_rules.cpp     | 2 +-
 test_coding_rules_test.sh | 2 +-
 version.hpp               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index e42d239..201c27a 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -1039,7 +1039,7 @@ void enforce_taboos(file const& f)
     taboo(f, R"(\(c\) *[0-9])");
     // Former addresses of the Free Software Foundation.
     taboo(f, "Cambridge");
-    taboo(f, "Temple");
+    taboo(f, "Temple P");
     // Patented.
     taboo(f, R"(\.gif)", boost::regex::icase);
     // Obsolete email address.
diff --git a/test_coding_rules_test.sh b/test_coding_rules_test.sh
index 8b7fe58..2ab0445 100755
--- a/test_coding_rules_test.sh
+++ b/test_coding_rules_test.sh
@@ -431,7 +431,7 @@ File 'eraseme_marker_001' has irregular defect marker 
'INELEGANT !!!'.
 File 'eraseme_marker_001' has irregular defect marker 'ELEGANT !! '.
 File 'eraseme_png_003-dot.dash-dot.png' exceeds 31-character file-name limit.
 File 'eraseme_taboo_001' breaks taboo 'Cambridge'.
-File 'eraseme_taboo_001' breaks taboo 'Temple'.
+File 'eraseme_taboo_001' breaks taboo 'Temple P'.
 File 'eraseme_taboo_001' breaks taboo 'Shibboleth'.
 File 'eraseme_taboo_001' breaks taboo 'sibboleth'.
 File 'eraseme_url_001' lacks lmi URL.
diff --git a/version.hpp b/version.hpp
index 7c7c7ac..c41d93a 100644
--- a/version.hpp
+++ b/version.hpp
@@ -22,6 +22,6 @@
 
 #include "config.hpp"
 
-#define LMI_VERSION "20190402T1521Z"
+#define LMI_VERSION "20190404T1223Z"
 
 #endif // version_hpp