From 2ff6ef019133bb6029cd76c4f79086ba859bf5b3 Mon Sep 17 00:00:00 2001
From: Shuo Chen <chenshuo@chenshuo.com>
Date: Wed, 24 Oct 2018 20:24:56 -0700
Subject: [PATCH] v2.0.0

---
 ChangeLog2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog2 b/ChangeLog2
index cd943d848..0b69e99e5 100644
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,6 +1,6 @@
-2018-??-??   Shuo Chen  <chenshuo@chenshuo.com>
+2018-10-24   Shuo Chen  <chenshuo@chenshuo.com>
   * First release of C++11 version of muduo.
-  * Forked after v1.0.9, e6c04c43 is the base.
+  * Forked after v1.0.9, e6c04c43 is the base. changes in cpp98 branch are integrated
   * Replace boost::shared_ptr/boost::weak_ptr with std::shared_ptr/std::weak_ptr.
   * Replace boost::function/boost::bind with std::function/std::bind/lambda.
   * Replace boost::ptr_vector<T> with std::vector<std::unique_ptr<T>>.