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
..
applications	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00
build-support	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00
configs/etc
data
desktops	yakuake: fix eval error	2010-05-25 09:02:25 +00:00
development	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00
games	Three Games and Perl Support for Irssi	2010-05-17 09:21:42 +00:00
lib	Build a package with debugging information so that you can run it within gdb or run valgrind on it.	2010-05-23 15:54:10 +00:00
misc	Build a package with debugging information so that you can run it within gdb or run valgrind on it.	2010-05-23 15:54:10 +00:00
os-specific	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00
servers	* Revert to Samba 3.3.3 because never versions (including 3.3.12)	2010-05-04 15:26:34 +00:00
shells
stdenv	Merging from trunk (conflict on glibc, I think I resolved it)	2010-05-19 15:26:00 +00:00
test
tools	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00
top-level	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00