Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix

2014-07-28 11:30:49 +02:00

..

audio

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

display-managers

freetype: major update, including some CVE security

2014-06-17 09:00:29 +02:00

editors

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

graphics

Merge branch 'x-updates' into staging

2014-07-22 22:28:39 +02:00

ike

ike: use stdenv.lib.licenses.sleepycat

2014-03-24 19:58:36 -05:00

inferno

Add missing 's' in remaining meta.maintainer(s) attrs

2014-07-22 23:49:21 +02:00

misc

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

networking

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

office

Merge remote-tracking branch 'origin/master' into staging

2014-07-14 17:04:55 +02:00

science

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

search

…

taxes

Add aangifte-2013

2014-03-01 16:54:16 +01:00

version-management

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

video

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

virtualization

qemu: 1.7.1 -> 2.0.0

2014-05-18 15:52:44 -05:00

window-managers

Merge recent master into x-updates

2014-07-17 19:30:56 +02:00