diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-03-17 16:58:35 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-03-17 16:58:35 +0100 |
| commit | bf33ee46c8fff4d181b7f28521f12175bd32ec77 (patch) | |
| tree | 5e0a9e1047af60389eee36da54182b52d3d53ee7 /AUTHORS | |
| parent | 524c6f82b0a3c010d0fd6a67b1afcfbf55b789a6 (diff) | |
| parent | 30cb532a560ed152b86506b80490e99195970271 (diff) | |
| download | systemtap-steved-bf33ee46c8fff4d181b7f28521f12175bd32ec77.tar.gz systemtap-steved-bf33ee46c8fff4d181b7f28521f12175bd32ec77.tar.xz systemtap-steved-bf33ee46c8fff4d181b7f28521f12175bd32ec77.zip | |
Merge branch 'master' into pr6866
Resolved conflicts:
runtime/task_finder.c: name vs path.
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2,6 +2,7 @@ Ananth N Mavinakayanahalli Anil Keshavamurthy Anithra Janakiraman Charles Spirakis +Dan Horak Dave Brolley Dave Nomura David Smith @@ -24,6 +25,7 @@ Mark McLoughlin Mark Wielaard Martin Hunt Masami Hiramatsu +Maynard Johnson Michael Meeks Mike Mason Nobuhiro Tachino |