Skip to content
Commit e8e868c1 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot 

Fix merge conflicts in CHANGES
parents 6620ca7d 6caec6f3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment