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
..
darwin	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
gnu
linux	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
windows	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00