diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-12-01 14:54:32 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-12-01 14:54:32 +0000 |
commit | b7f94c9002bd8578e89ce02a22172545ace353a3 (patch) | |
tree | d4df544d04e4c6b2b55586d5b1539dcd63a489b1 /progs/tools/trace/.gitignore | |
parent | 87eec80c1120d2cd9749ee360b77922feabf7f10 (diff) |
st/xorg: fix merge droppings
These were stranded in emacs and not saved before committing.
Diffstat (limited to 'progs/tools/trace/.gitignore')
0 files changed, 0 insertions, 0 deletions