Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25188		2010-12-17 20:39:58 +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	GNU Hurd: Add dependency on Parted.	2010-12-12 23:21:42 +00:00
linux	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +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