Files
nixpkgs/pkgs/misc
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
..
2013-12-18 18:18:23 +02:00
2013-09-26 18:03:43 +02:00
2013-11-24 13:27:24 +01:00
2010-07-28 15:35:01 +00:00
2013-05-08 15:43:07 +03:00