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
..
5.14
5.16	Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging	2014-09-23 11:27:53 +02:00
5.20	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
sys-perl