summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-12-01 14:54:32 +0000
committerKeith Whitwell <keithw@vmware.com>2009-12-01 14:54:32 +0000
commitb7f94c9002bd8578e89ce02a22172545ace353a3 (patch)
treed4df544d04e4c6b2b55586d5b1539dcd63a489b1 /progs
parent87eec80c1120d2cd9749ee360b77922feabf7f10 (diff)
st/xorg: fix merge droppings
These were stranded in emacs and not saved before committing.
Diffstat (limited to 'progs')
0 files changed, 0 insertions, 0 deletions