Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25188		2010-12-17 20:39:58 +00:00
..
enlightenment
gnome-2.28	Updating from trunk.	2010-11-11 22:18:14 +00:00
kde-3
kde-4.4	Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages	2010-10-07 21:21:31 +00:00
kde-4.5	Switch to kde-l10n-4.5.4 by default	2010-12-14 10:21:29 +00:00
xfce-4	* Added xfce4-mixer. This requires gstreamer and gst-plugins-base.	2010-10-10 22:34:48 +00:00