Lluís Batlle i Rossell 5417c720fd Merging from trunk. ... I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878		2010-08-02 15:48:19 +00:00
..
darwin	pkgs/os-specific/darwin/lipo: add support for running the native Darwin lipo utility	2010-04-29 14:56:44 +00:00
gnu	GCC 4.5: Fix libpthread-related `LIB_SPEC' on GNU.	2010-07-15 14:06:09 +00:00
linux	Merging from trunk.	2010-08-02 15:48:19 +00:00
windows	Making wxGTK stay wxGTK even cross-built, so I remove the wxMSW code I added	2010-05-06 19:19:22 +00:00