Lluís Batlle i Rossell fa1a414aee Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that ... well svn path=/nixpkgs/branches/stdenv-updates/; revision=21975		2010-05-25 20:38:18 +00:00
..
compilers	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00
eclipse	ecj darwin~	2010-03-01 16:40:02 +00:00
guile-modules
interpreters	Moved 'maintainers' attribute into the meta section of the expression.	2010-05-09 16:01:44 +00:00
libraries	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00
misc
perl-modules	* Don't use nested lists.	2010-04-01 14:41:51 +00:00
python-modules	* pycrypto updated to 2.1.0.	2010-05-20 10:41:10 +00:00
ruby-modules
tools	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00