Yury G. Kudryashov 5a39444e76 Fix wrong merge ... svn path=/nixpkgs/branches/stdenv-updates/; revision=32714		2012-03-01 07:16:34 +00:00
..
applications	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
build-support	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
data	svn merge ^/nixpkgs/trunk	2012-02-19 11:16:24 +00:00
desktops	kdelibs depend on xz. Really.	2012-02-19 11:19:11 +00:00
development	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
games	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
lib	add PSFL, update python meta (license, maintainers, unify description)	2012-02-26 17:23:16 +00:00
misc	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
os-specific	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
servers	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
shells
stdenv	Honor propagatedUserEnvPackages in setup.sh	2012-02-17 21:37:15 +00:00
test
tools	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
top-level	Fix wrong merge	2012-03-01 07:16:34 +00:00