Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +02:00
..
audio	zynaddsubfx: 2.4.3 -> 2.4.4	2014-08-31 22:19:04 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
graphics	processing: apply patch from IRC to make it work without the IDE too	2014-09-02 08:58:09 +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	Minor cleanup	2014-09-02 02:04:59 +04:00
networking	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
office	Added support for minimal zim desktop wiki package.	2014-09-02 02:07:23 +04:00
science	Update pari	2014-09-02 14:25:17 +04:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes
version-management	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
video	mkvtoolnix: update from 6.5.0 to 7.1.0	2014-08-29 14:34:24 +01: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