Files
nixpkgs/pkgs/misc
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
..
2009-12-25 00:01:31 +00:00
2009-11-07 09:25:06 +00:00
2009-11-25 07:51:06 +00:00
2009-12-24 23:27:05 +00:00
2009-12-11 13:58:15 +00:00
2009-08-22 23:11:12 +00:00
2009-11-19 21:43:03 +00:00
2008-03-29 00:49:26 +00:00
2009-12-24 23:19:53 +00:00