Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging ... Conflicts: pkgs/applications/editors/vim/macvim.nix		2014-11-04 14:30:43 +01:00
..
default.nix	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00