Fix mis-merge of changelog.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dfa0bf602c62e2332547a5aaa9175c864a2dbc57..eba948a86fe553c660ed900907057efef6b0d885 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -10,15 +10,12 @@
 
 2011-02-15  Michael Snyder  <msnyder@vmware.com>
 
-       * command.h (enum command_class): New class 'no_set_class', for
-       "show" commands without a corresponding "set" command.
-       * value.c (_initialize_values): Use 'no_set_class' for "show values".
-       * copying.c (_initialize_copying): Ditto for "show copying" and
-       "show warranty".
-       * cli/cli-cmds.c (init_cli_cmds): Ditto for "show commands" and
-       "show version".
-       * cli/cli-setshow.c (cmd_show_list): Skip "show" commands for
-       which there is no corresponding "set" command (eg. "show copying").
+       * thread.c (info_threads_command): Process arg as thread id,
+       or list of thread ids.
+       (thread_find_command): New command.
+       (_initialize_thread): Document argument for info threads.
+       Document 'thread find' command.
+       * NEWS: Document new command "thread find".
 
 2011-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
@@ -52,6 +49,18 @@
        (efpr_pseudo_register_write): Use regcache_raw_write_part to read
        and write data from/to the VMX register.
 
+2011-02-14  Michael Snyder  <msnyder@vmware.com>
+
+       * command.h (enum command_class): New class 'no_set_class', for
+       "show" commands without a corresponding "set" command.
+       * value.c (_initialize_values): Use 'no_set_class' for "show values".
+       * copying.c (_initialize_copying): Ditto for "show copying" and
+       "show warranty".
+       * cli/cli-cmds.c (init_cli_cmds): Ditto for "show commands" and
+       "show version".
+       * cli/cli-setshow.c (cmd_show_list): Skip "show" commands for
+       which there is no corresponding "set" command (eg. "show copying").
+
 2011-02-14  Pedro Alves  <pedro@codesourcery.com>
            Jan Kratochvil  <jan.kratochvil@redhat.com>