Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=24429		2010-10-23 14:52:21 +00:00
..
gnonlin	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
gst-ffmpeg	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
gst-plugins-base	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
gst-plugins-good	Bumped gst-plugins-good to version 0.10.25. This also fixes a compilation error	2010-10-11 13:51:50 +00:00
gstreamer	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
default.nix	* Added xfce4-mixer. This requires gstreamer and gst-plugins-base.	2010-10-10 22:34:48 +00:00