From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Jul 2010 21:39:03 +0000 (+0200)
Subject: Merge branch 'other-build-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b70653609b17dda67a3326bcb9333f51be6c00f7;p=buildroot.git

Merge branch 'other-build-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
---

b70653609b17dda67a3326bcb9333f51be6c00f7
diff --cc CHANGES
index e6fbe356e0,d0a827b14c..99900ad9c3
--- a/CHANGES
+++ b/CHANGES
@@@ -14,16 -14,16 +14,16 @@@
  	New packages: cgilua, copas, coxpcall, ffmpeg, libsvgtiny,
  	luafilesystem, luasocket, rings, wsapi, xavante, xterm
  
--	Updated/fixed packages: berkeleydb, bash, blackbox, busybox,
- 	bzip2, cdrkit, cmake, dash, dhcp, dialog, diffutils, distcc,
 -	bzip2, cdrkit, cmake, dash, dialog, diffutils, distcc,
--	dmalloc, dnsmasq, dropbear, e2fsprogs, fbv, file, fontconfig,
--	gawk, gstreamer, gzip, intltool, ipsec-tools, iptables,
--	libart, libcgi, libfuse, libgpg-error, libidn, liblockfile,
--	libpng, links, linux-fusion, lmbench, lrzsz, make,
- 	module-init-tools, mysql_client, nbd, ncurses, netperf,
- 	ntfsprogs, openssl, php, qt, quagga, sqlite, sdl, sdl_mixer,
- 	sdl_sound, sdl_ttf, squashfs, tn5250, tremor, usbutils,
- 	xkeyboard-config, xserver_xorg-server, xvkbd
 -	module-init-tools, nbd, ncurses, netperf, ntfsprogs, openssl,
 -	php, qt, quagga, sqlite, sdl, sdl_mixer, sdl_sound, sdl_ttf,
 -	squashfs, tn5250, tremor, usbutils, xkeyboard-config,
 -	xserver_xorg-server, xvkbd
++	Updated/fixed packages: alsa-lib, berkeleydb, bash, blackbox,
++	busybox, bzip2, cdrkit, cmake, dash, dhcp, dialog, diffutils,
++	distcc, dmalloc, dnsmasq, dropbear, e2fsprogs, fbv, file,
++	fontconfig, gawk, gstreamer, gzip, intltool, ipsec-tools,
++	iptables, libart, libcgi, libfuse, libgpg-error, libidn,
++	liblockfile, libpng, links, linux-fusion, lmbench, lrzsz,
++	make, module-init-tools, mysql_client, nbd, ncurses, neon,
++	netperf, ntfsprogs, openssl, php, qt, quagga, sqlite, sdl,
++	sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,
++	usbutils, xkeyboard-config, xserver_xorg-server, xvkbd
  
  	Removed packages: modutils, portage, rxvt