Files
nixpkgs/pkgs/tools/compression
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-03-28 19:28:59 +00:00
2010-01-13 21:11:48 +00:00
2009-03-22 13:03:37 +00:00
2009-10-28 12:29:13 +00:00