Files
nixpkgs/pkgs/tools/text
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
..
2008-05-14 07:58:32 +00:00
2009-11-27 10:16:42 +00:00
2010-01-14 12:46:10 +00:00
2009-04-30 19:36:26 +00:00
2009-01-10 23:35:15 +00:00
2008-07-18 23:36:28 +00:00
2008-08-25 10:00:17 +00:00
2009-11-10 14:25:26 +00:00