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
..
2010-01-04 07:44:27 +00:00
2010-01-14 08:39:41 +00:00
2010-01-13 13:50:32 +00:00
2009-12-21 07:49:59 +00:00
2009-07-24 12:28:39 +00:00
2009-12-02 21:03:02 +00:00
2009-11-06 09:44:03 +00:00
2010-01-12 10:34:14 +00:00
2009-12-21 07:49:31 +00:00
2009-11-16 18:42:43 +00:00
2009-11-20 11:37:11 +00:00
2009-12-11 13:58:23 +00:00
2009-05-13 19:02:23 +00:00
2009-11-18 09:39:59 +00:00
2009-10-13 21:45:20 +00:00
2009-05-19 23:25:58 +00:00
2009-10-19 11:26:13 +00:00
2009-12-29 14:57:01 +00:00
2009-05-14 14:43:50 +00:00
2009-12-11 13:58:23 +00:00
2009-12-12 18:39:09 +00:00
2009-10-02 12:12:23 +00:00
2009-12-10 13:16:06 +00:00
2009-11-18 09:39:59 +00:00
2009-11-06 19:27:32 +00:00
2010-01-05 13:44:13 +00:00
2009-12-09 14:07:09 +00:00
2009-10-28 14:06:56 +00:00
2009-10-28 14:06:56 +00:00