From 8b2c10f098933cd73a7c052fa0b8bc22e44ccd11 Mon Sep 17 00:00:00 2001 From: Joongi Kim Date: Wed, 3 Feb 2016 17:36:27 +0900 Subject: [PATCH] Fix mistakes in submodule mgmt.. --- 3rdparty/googletest | 2 +- src/lib/gtest/gtest-all.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/3rdparty/googletest b/3rdparty/googletest index 82b11b8..ff5ffd4 160000 --- a/3rdparty/googletest +++ b/3rdparty/googletest @@ -1 +1 @@ -Subproject commit 82b11b8cfcca464c2ac74b623d04e74452e74f32 +Subproject commit ff5ffd457e032c8be8a64a7a94c824063c8b11e3 diff --git a/src/lib/gtest/gtest-all.cc b/src/lib/gtest/gtest-all.cc index 8374d49..c1f186b 100644 --- a/src/lib/gtest/gtest-all.cc +++ b/src/lib/gtest/gtest-all.cc @@ -4378,6 +4378,8 @@ bool ShouldUseColor(bool stdout_is_tty) { String::CStringEquals(term, "xterm-256color") || String::CStringEquals(term, "screen") || String::CStringEquals(term, "screen-256color") || + String::CStringEquals(term, "tmux") || + String::CStringEquals(term, "tmux-256color") || String::CStringEquals(term, "rxvt-unicode") || String::CStringEquals(term, "rxvt-unicode-256color") || String::CStringEquals(term, "linux") ||