diff options
Diffstat (limited to 'testsuite/ChangeLog')
| -rw-r--r-- | testsuite/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 07f2a15c..f44c6488 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,8 +1,15 @@ +<<<<<<< HEAD:testsuite/ChangeLog 2009-01-30 Will Cohen <wcohen@redhat.com> * systemtap.samples/queue_demo.exp: * systemtap.samples/queue_demo.stp: Remove. +======= +2009-02-01 Stan Cox <scox@redhat.com> + + * systemtap.base/labels.exp: New. + +>>>>>>> 3d65f39002440cfdeeac94d7a7a6c9a7aead2e54:testsuite/ChangeLog 2009-01-30 Frank Ch. Eigler <fche@elastic.org> * semok/twenty.stp: Don't spew so much into systemtap.log. |