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
..
applications	Merging from trunk.	2010-08-02 15:48:19 +00:00
build-support	Merging from trunk.	2010-08-02 15:48:19 +00:00
data	* ltrace: updated to 0.5.3.	2010-07-29 18:55:16 +00:00
desktops	Merging from trunk.	2010-08-02 15:48:19 +00:00
development	Merging from trunk.	2010-08-02 15:48:19 +00:00
games	svn path=/nixpkgs/trunk/; revision=22839	2010-08-01 15:14:33 +00:00
lib	* Add callPackage etc.	2010-08-02 13:57:57 +00:00
misc	Merging from trunk.	2010-08-02 15:48:19 +00:00
os-specific	Merging from trunk.	2010-08-02 15:48:19 +00:00
servers	pulseaudio: udev and bluez support	2010-07-31 13:05:58 +00:00
shells
stdenv	Fixing the unpack bootstrap tools script so it works not only for mips.	2010-08-01 22:00:14 +00:00
test
tools	Merging from trunk.	2010-08-02 15:48:19 +00:00
top-level	Merging from trunk.	2010-08-02 15:48:19 +00:00