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
..
admin	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
archivers	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +00:00
backup	duplicity: updated to version 0.6.17	2012-02-06 19:45:18 +00:00
bluetooth	make blueman create the audio sink/source via pulse	2011-09-01 10:03:01 +00:00
cd-dvd	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
compression	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +00:00
filesystems	svn merge ^/nixpkgs/trunk	2012-02-16 15:02:26 +00:00
graphics	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +00:00
misc	* man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads	2012-03-06 10:14:00 +00:00
networking	* Sync with the trunk.	2012-03-01 22:22:24 +00:00
package-management	* Sync with the trunk.	2012-03-01 22:22:24 +00:00
security	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
system	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
text	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +00:00
typesetting	svn merge ^/nixpkgs/trunk	2012-03-01 07:04:39 +00:00
video	Updating rtmpdump to the 2.4 (what I think it is 2.4) in their git repository.	2011-09-25 09:04:24 +00:00
virtualization	svn merge ^/nixpkgs/trunk	2012-02-25 20:52:15 +00:00
X11	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00