aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-22 17:42:06 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-22 17:42:06 +0000
commit81e264d4af1e5d5469f7654ebe463ed168e068ec (patch)
tree4eeb99add58df59c1462600eaaddd768283febe3 /AUTHORS
parentbe2f9f7fe07b75c0f400593a28799f7c131f1b0c (diff)
downloadbusybox-81e264d4af1e5d5469f7654ebe463ed168e068ec.tar.gz
fix double merge
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions