Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular ... Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix		2014-08-31 12:23:18 +02:00
..
admin	Fix many package descriptions	2014-08-24 22:31:37 +02:00
archivers	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
audio	pnmixer: cleanup	2014-08-25 10:04:49 +02:00
backup	Fix many package descriptions	2014-08-24 22:31:37 +02:00
bluetooth
cd-dvd	Fix many package descriptions	2014-08-24 22:31:37 +02:00
compression	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
filesystems	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
graphics	Fix many package descriptions	2014-08-24 22:31:37 +02:00
inputmethods	Merge pull request #3275 from taku0/gtk-env	2014-08-29 01:35:38 +04:00
misc	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
networking	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
package-management	Fix many package descriptions	2014-08-24 22:31:37 +02:00
security	Merge pull request #3793 from NixOS/pkgs/nfchacktools	2014-08-26 01:32:50 +02:00
system	Add di package	2014-08-28 14:16:11 +02:00
text	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
typesetting	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
video	Fix many package descriptions	2014-08-24 22:31:37 +02:00
virtualization
X11	Merge pull request #3771 from bjornfor/fix-package-descriptions	2014-08-25 10:00:01 +02:00