nixpkgs/pkgs/applications
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	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-08-02 05:08:07 +02:00
..
audio Merge recent master into x-updates 2014-08-02 05:08:07 +02:00
display-managers freetype: major update, including some CVE security 2014-06-17 09:00:29 +02:00
editors zed: build from source, ditch the installer, upgrade node-webkit 2014-07-30 12:43:24 +02:00
graphics Merge recent master into x-updates 2014-08-02 05:08:07 +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 recent master into x-updates 2014-08-02 05:08:07 +02:00
networking Merge recent master into x-updates 2014-08-02 05:08:07 +02:00
office Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
science Fix broken license references. 2014-07-28 11:43:20 +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 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
video Merge recent master into x-updates 2014-08-02 05:08:07 +02:00
virtualization Remove broken flag for xen, build with gcc45. 2014-08-01 17:18:27 +02:00
window-managers Merge recent master into x-updates 2014-08-02 05:08:07 +02:00