Lluís Batlle i Rossell dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
..
2007-11-16 21:05:15 +00:00
2008-06-04 14:03:20 +00:00
2009-12-12 18:39:09 +00:00
2005-12-05 14:11:09 +00:00
2006-03-01 09:18:22 +00:00
2007-03-28 17:49:51 +00:00