Files
nixpkgs/pkgs/tools
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
..
2014-01-04 15:02:52 +04:00
2014-01-04 18:34:53 +01:00
2013-12-19 17:20:53 +01:00
2013-12-29 10:01:22 +01:00
2013-12-21 02:28:26 +02:00
2013-12-25 23:56:41 +01:00