aboutsummaryrefslogtreecommitdiff
path: root/target/Config.in.arch
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-04-08 11:37:12 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-04-08 11:37:12 +0200
commite8e868c14bc5ab6cf6a9e2507823e435520efe2a (patch)
treed77981838c034d8819e745d2e1782128ee0bf2d6 /target/Config.in.arch
parent6620ca7dfe3d3340eee4ea662d97ee611d84814f (diff)
parent6caec6f3b3aecf41c3a051ffa4b5d9a2e41775ca (diff)
downloadbuildroot-e8e868c14bc5ab6cf6a9e2507823e435520efe2a.tar.gz
buildroot-e8e868c14bc5ab6cf6a9e2507823e435520efe2a.tar.bz2
Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot
Fix merge conflicts in CHANGES
Diffstat (limited to 'target/Config.in.arch')
0 files changed, 0 insertions, 0 deletions