Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25061		2010-12-11 12:47:00 +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	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +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