diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-08 11:37:12 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-08 11:37:12 +0200 |
| commit | e8e868c14bc5ab6cf6a9e2507823e435520efe2a (patch) | |
| tree | d77981838c034d8819e745d2e1782128ee0bf2d6 /scripts/test | |
| parent | 6620ca7dfe3d3340eee4ea662d97ee611d84814f (diff) | |
| parent | 6caec6f3b3aecf41c3a051ffa4b5d9a2e41775ca (diff) | |
Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot
Fix merge conflicts in CHANGES
Diffstat (limited to 'scripts/test')
0 files changed, 0 insertions, 0 deletions