OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove collision markers from earlier commit

This commit is contained in:
Doug Evans 2017-03-16 10:39:26 -07:00
parent a8be5506b6
commit 2cc36e25db
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/testsuite/ChangeLog
View File

@ -1,10 +1,9 @@
<<<<<<< HEAD
2017-03-16 Thomas Preud'homme <thomas.preudhomme@arm.com>
* gdb.cp/m-static.exp: Fix expectation for prototype of
test5.single_constructor and single_constructor::single_constructor.
=======
2017-03-15 Doug Evans <dje@google.com>
2017-03-16 Doug Evans <dje@google.com>
* gdb.guile/scm-value.c (main) Delete locals sptr, sn.
* gdb.guile/scm-lazy-string.c: New file.
@ -12,7 +11,7 @@
* gdb.guile/scm-lazy-string.exp: ... here, new file. Add more tests
for pointer, array, typedef lazy strings.
2017-03-15 Doug Evans <dje@google.com>
2017-03-16 Doug Evans <dje@google.com>
PR python/17728, python/18439, python/18779
* gdb.python/py-value.c (main) Delete locals sptr, sn.
@ -21,7 +20,6 @@
* gdb.python/py-value.exp: Move lazy string tests to ...
* gdb.python/py-lazy-string.exp: ... here. Add more tests for pointer,
array, typedef lazy strings.
>>>>>>> Fix various python lazy string bugs.
2017-03-14 Anton Kolesov <anton.kolesov@synopsys.com>