nixpkgs/pkgs/desktops/e18
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
..
default.nix e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
econnman.nix e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
efl.nix e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
elementary.nix e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
emotion.nix e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
enlightenment.nix Merge remote-tracking branch 'origin/master' into staging 2014-07-28 11:30:49 +02:00
evas.nix e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
terminology.nix e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00