Yury G. Kudryashov a670a7aca1 merge trunk ... A few conflicts due to renames svn path=/nixpkgs/branches/stdenv-updates/; revision=30947		2011-12-16 22:57:21 +00:00
..
applications	merge trunk	2011-12-16 22:57:21 +00:00
build-support	svn merge https://nixos.org/repos/nix/nixpkgs/trunk	2011-12-15 19:16:38 +00:00
data	shared-desktop-ontologies-0.8.1	2011-12-15 20:16:46 +00:00
desktops	kdelibs: remove unused parameter	2011-12-16 19:38:43 +00:00
development	merge trunk	2011-12-16 22:57:21 +00:00
games	* Sync with the trunk.	2011-12-12 16:54:35 +00:00
lib	* Sync with the trunk.	2011-12-12 16:54:35 +00:00
misc	* Sync with the trunk.	2011-12-12 16:54:35 +00:00
os-specific	svn merge https://nixos.org/repos/nix/nixpkgs/trunk	2011-12-15 19:16:38 +00:00
servers	Upgrading CouchDB to 1.1.1 with SpiderMonkey 185	2011-12-15 12:24:25 +00:00
shells	* Latest bash patches.	2011-12-12 17:10:28 +00:00
stdenv	* Streamline the stdenv bootstrap and resulting closure by removing	2011-12-14 14:31:56 +00:00
test	Add a new way to handle option sets.	2008-08-05 17:16:35 +00:00
tools	svn merge https://nixos.org/repos/nix/nixpkgs/trunk	2011-12-15 19:16:38 +00:00
top-level	merge trunk	2011-12-16 22:57:21 +00:00