Fix merge issues in gdb/ChangeLog and gdb/testsuite/ChangeLog...
authorJoel Brobecker <brobecker@adacore.com>
Mon, 2 Apr 2018 18:34:11 +0000 (11:34 -0700)
committerJoel Brobecker <brobecker@adacore.com>
Mon, 2 Apr 2018 18:34:11 +0000 (11:34 -0700)
commit121ad66c941718bb0b1f7caffe0c555829d2fd2b
treed18a8408a0c7d5ea648aeca10fb44f23691ff0cf
parent79f18731714e7f07af6e78b8da8a1ffacf4247b7
Fix merge issues in gdb/ChangeLog and gdb/testsuite/ChangeLog...

... introduced by the previous commit to these files.
Also adjust the date in the new ChangeLog entries (out of date).
gdb/ChangeLog
gdb/testsuite/ChangeLog