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 /CHANGES | |
| 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 'CHANGES')
| -rw-r--r-- | CHANGES | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -8,13 +8,13 @@ X.org updated to 7.5. - New packages: librsync, lmbench, netperf, squid + New packages: librsync, libusb-compat, lmbench, netperf, squid Updated/fixed packages: busybox, dnsmasq, dosfstools, e2fsprogs, fbv, freetype, iperf, iptables, iw, less, libdrm, libgcrypt, libglib2, libpng, libxml2, matchbox, mdadm, memstat, mtd-utils, nano, openssl, php, pppd, qt, radvd, setserial, - squashfs, wget, xlib_libX11, xlib_libXfont + squashfs, usb_modeswith, wget, xlib_libX11, xlib_libXfont Issues resolved (http://bugs.uclibc.org): @@ -24,6 +24,9 @@ #805: [PATCH] mdadm - version update #817: integrator926_defconfig uses unsupported uboot board name #851: Add option to specify --sysroot value for external toolchain + #1093: Upgrade libusb to v1.0.3 and add new libusb-compat + package for compatibility with old packages that expect + the pre-1.0 API. #1105: Add new netperf package #1111: Bump wget to 1.12 and migrate to Makefile.autotools.in #1117: Bump nano to 2.2.3 and migrate to Makefile.autotools.in |