4 commits

Author	SHA1	Message	Date
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
Matej Cotman	5b97751a8f	fix e18 cpufreq module: set setuid to freqset	2014-07-25 12:49:31 +02:00
Vladimír Čunát	4cbf520bfe	e18.enlightenment: fix build by adding bzip2 ... I'm lazy to find how exatly the need propagated in x-updates.	2014-07-21 15:06:44 +02:00
Matej Cotman	1afb26fb17	e18: enlightenment desktop manager version 18	2014-07-17 23:00:38 +02:00