Merge gdb/common/ChangeLog back to gdb/ChangeLog.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f565e237bc6c24f314067088a0aad50a6c26120c..c9c08d402e886452d7f6056647dbdc4d6980ebea 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -371,6 +371,10 @@
 
        * Makefile.in (CLEANDIRS): Remove duplicated common dir.
 
+2011-02-11  Yao Qi  <yao@codesourcery.com>
+
+       * common/Makefile.in: Add copyright header.
+
 2011-02-11  Pedro Alves  <pedro@codesourcery.com>
 
        * infrun.c (proceed): Move switching out and in of tfind mode from
@@ -384,6 +388,15 @@
        * configure.ac: Add common to sub dir.
        * configure: Regenerate.
 
+2011-02-11  Yao Qi  <yao@codesourcery.com>
+
+       Build libcommon.a.
+
+       * common/Makefile.in: New.
+       * common/configure.ac: New.
+       * common/aclocal.m4: New.
+       * common/configure: Generate.
+
 2011-02-10  Pedro Alves  <pedro@codesourcery.com>
 
        * vec.h (VEC_block_remove): Place VEC_ASSERT_INFO on the right

diff --git a/gdb/common/ChangeLog b/gdb/common/ChangeLog
deleted file mode 100644 (file)
index 881f999..0000000
--- a/gdb/common/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-2011-02-11  Yao Qi  <yao@codesourcery.com>
-
-       * Makefile.in: Add copyright header.
-
-2011-02-11  Yao Qi  <yao@codesourcery.com>
-
-       Build libcommon.a.
-
-       * Makefile.in: New.
-       * configure.ac: New.
-       * aclocal.m4: New.
-       * configure: Generate.
-