diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-01-07 13:07:48 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-01-07 13:07:48 -0500 |
| commit | 612bf518a48194e13b77bac424f6b99868593088 (patch) | |
| tree | dd0d6fedafbef72bd0195906dfc3f84017fbee8b | |
| parent | 0efdbd63ff75def9d0ad3162b83a4eb44472d341 (diff) | |
| parent | 6dd3921952f022c41713ec02e4d6bd0b04109af8 (diff) | |
Merge branch 'trace-cmd' into trace-view
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
| @@ -2,7 +2,8 @@ | |||
| 2 | trace-cmd | 2 | trace-cmd |
| 3 | *.so | 3 | *.so |
| 4 | *.a | 4 | *.a |
| 5 | trace.dat | 5 | *.dat |
| 6 | *.patch | ||
| 6 | *~ | 7 | *~ |
| 7 | kernelshark | 8 | kernelshark |
| 8 | trace-graph | 9 | trace-graph |