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
..
generic	* Add support for lzma patches.	2009-12-18 11:26:36 +00:00
linux	Updating the url for the latest armv5tel linux bootstrap-tools.	2009-12-08 19:34:25 +00:00
mingw	ln issue mingw	2009-11-16 12:22:55 +00:00
native	add support for x86_64-darwin	2009-11-26 15:45:31 +00:00
nix	Updating from trunk.	2009-12-10 14:48:45 +00:00
adapters.nix	Merging from trunk.	2010-01-14 14:49:31 +00:00
common-path.nix
default.nix	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00