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-06-30 15:58:02 +00:00
2009-11-17 15:31:48 +00:00
2009-05-24 10:57:46 +00:00
2009-05-24 10:57:41 +00:00
2008-09-26 08:57:51 +00:00
2008-02-28 23:43:21 +00:00
2009-05-13 19:02:23 +00:00
2005-12-05 14:11:09 +00:00
2009-11-18 19:10:24 +00:00
2009-11-14 20:14:21 +00:00
2009-11-08 22:30:38 +00:00
2009-12-03 15:01:54 +00:00
2008-07-06 15:46:10 +00:00
2009-11-18 13:18:28 +00:00
2009-11-23 17:06:57 +00:00
2008-03-04 16:20:11 +00:00
2009-12-13 16:18:53 +00:00
2009-12-25 19:20:38 +00:00
2009-12-21 23:02:06 +00:00
2009-12-21 08:03:30 +00:00
2010-01-10 19:03:39 +00:00
2009-05-10 12:03:53 +00:00
2005-12-05 14:11:09 +00:00
2009-07-16 11:22:37 +00:00
2006-12-27 18:17:53 +00:00
2009-06-21 18:37:54 +00:00
2009-01-29 17:48:45 +00:00
2010-01-04 13:37:49 +00:00
2008-10-01 15:57:22 +00:00
2008-02-12 08:42:33 +00:00
2009-12-09 12:59:23 +00:00
2009-12-22 09:23:17 +00:00
2009-12-11 13:58:23 +00:00
2010-01-03 11:08:45 +00:00