This is the mail archive of the
systemtap-cvs@sourceware.org
mailing list for the systemtap project.
[SCM] systemtap: system-wide probe/trace tool branch, master, updated. release-1.2-242-gd0f224e
- From: scox at sourceware dot org
- To: systemtap-cvs at sourceware dot org
- Date: 10 Jun 2010 13:50:01 -0000
- Subject: [SCM] systemtap: system-wide probe/trace tool branch, master, updated. release-1.2-242-gd0f224e
- Reply-to: systemtap at sourceware dot org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "systemtap: system-wide probe/trace tool".
The branch, master has been updated
via d0f224e0804cd054d011e4b6dc843a7c4339d719 (commit)
from e61774fc6e469348b01da64689318bc4e8aa509d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d0f224e0804cd054d011e4b6dc843a7c4339d719
Author: Stan Cox <scox@redhat.com>
Date: Thu Jun 10 09:49:05 2010 -0400
Fix 3-way merge result.
* sdt.h: Remove extra hunk from merge.
-----------------------------------------------------------------------
Summary of changes:
includes/sys/sdt.h | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
hooks/post-receive
--
systemtap: system-wide probe/trace tool