Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
builder.sh
common.nix
cve-2014-0475.patch
default.nix
dont-use-system-ld-so-cache.patch
dont-use-system-ld-so-preload.patch
fix-math.patch
fix_path_attribute_in_getconf.patch
glibc-crypt-blowfish.patch
info.nix
locales-builder.sh
locales.nix
nix-locale-archive.patch
rpcgen-path.patch