David Guibert a45d06f7fb Merge commit 'f54c97b' into HEAD ... svn path=/nixpkgs/trunk/; revision=25768		2011-02-02 20:05:47 +00:00
..
applications	Merge commit 'f54c97b' into HEAD	2011-02-02 20:05:47 +00:00
build-support	vmTools: add some arguments with previous defaults	2011-02-01 12:11:05 +00:00
data	Some improvements to intl-rich layout	2010-12-17 12:19:34 +00:00
desktops	* Doh.	2011-02-02 16:44:50 +00:00
development	* boehm-gc: For simplicity, use a tarball containing the CVS export	2011-02-02 12:17:29 +00:00
games	Adding Sphere of Influence	2011-01-28 08:13:52 +00:00
lib	Adding myself to the maintainers list	2011-01-29 23:16:35 +00:00
misc	Update paths - does not fix all the problems, apparently	2011-01-28 10:22:30 +00:00
os-specific	* Updated iputils (though perhaps we should just use GNU inetutils).	2011-02-02 16:05:18 +00:00
servers	I remove a commented line for freeswitch parallel build. It failed once	2011-01-21 22:12:39 +00:00
shells	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
stdenv	* makeStaticBinaries: handle the case where configureFlags is	2011-01-20 09:40:17 +00:00
test	Add a new way to handle option sets.	2008-08-05 17:16:35 +00:00
tools	* Updated AEFS.	2011-02-02 15:12:15 +00:00
top-level	* Updated iputils (though perhaps we should just use GNU inetutils).	2011-02-02 16:05:18 +00:00