Lluís Batlle i Rossell 6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it) ... svn path=/nixpkgs/branches/stdenv-updates/; revision=21879		2010-05-19 15:26:00 +00:00
..
compilers	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
eclipse	ecj darwin~	2010-03-01 16:40:02 +00:00
guile-modules	Add GNU guile-gnome.	2009-10-05 22:21:50 +00:00
interpreters	Moved 'maintainers' attribute into the meta section of the expression.	2010-05-09 16:01:44 +00:00
libraries	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
misc	removing old bleeding edge cruft replacing it by a niftier version using	2009-12-11 13:58:23 +00:00
perl-modules	* Don't use nested lists.	2010-04-01 14:41:51 +00:00
python-modules	Replace codegen script which was failing with EACCESS. Test Gajim build worked fine	2010-05-18 20:13:39 +00:00
ruby-modules	Two Ruby modules	2008-10-05 09:00:56 +00:00
tools	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00