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
..
audio	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	ed: update to 1.10, working around *.lz problem	2014-08-30 23:00:58 +02:00
graphics	gimp: Update to 2.8.14.	2014-08-27 18:46:24 +02:00
ike	Fix various evaluation problems	2014-08-22 11:57:40 +02:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	Merge pull request #3813 from AndersonTorres/lilyterm	2014-08-29 01:30:35 +04:00
networking	Merge recent master into staging	2014-08-30 10:04:02 +02:00
office	Fix many package descriptions	2014-08-24 22:31:37 +02:00
science	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	Merge recent master into staging	2014-08-30 10:04:02 +02:00
video	Merge pull request #3527 from AndersonTorres/mpv	2014-08-29 01:41:22 +04:00
virtualization	Merge recent master into staging	2014-08-30 10:04:02 +02:00
window-managers	Fix many package descriptions	2014-08-24 22:31:37 +02:00