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
..
documentation	man-pages: Update to 3.64	2014-04-16 18:43:38 +02:00
fonts	Consistently use the package name opensans-ttf everywhere.	2014-07-16 16:22:47 -04:00
icons	hicolor_icon_theme: minor update 0.12 -> 0.13	2013-12-28 15:08:47 +01:00
misc	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
sgml+xml	docbook5_xsl: update from 1.75.2 to 1.78.1	2014-04-09 12:41:10 +02:00