Eelco Dolstra 17fe5f329a * man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads ... the first file that exists, so this is necessary to allow the builtin config to be overriden. svn path=/nixpkgs/branches/stdenv-updates/; revision=32812		2012-03-06 10:14:00 +00:00
..
applications	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +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	svn merge ^/nixpkgs/trunk	2012-03-05 21:01:47 +00:00
development	svn merge ^/nixpkgs/trunk	2012-03-05 21:01:47 +00:00
games	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +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-05 10:00:23 +00:00
os-specific	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +00:00
servers	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +00:00
shells	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
stdenv	Honor propagatedUserEnvPackages in setup.sh	2012-02-17 21:37:15 +00:00
test
tools	* man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads	2012-03-06 10:14:00 +00:00
top-level	svn merge ^/nixpkgs/trunk	2012-03-05 21:01:47 +00:00