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
..
audio	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
display-managers/slim
editors	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
graphics	Fix digikam buld	2010-10-14 09:52:10 +00:00
misc	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
networking	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
office	Merging roconnor's and ludo' texmacs derivations.	2010-10-04 15:07:38 +00:00
science	Updating from trunk.	2010-09-17 19:10:21 +00:00
taxes
version-management	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
video	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
virtualization	Bumped VirtualBox version to 3.2.8	2010-10-07 15:14:15 +00:00
window-managers	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00