Files
nixpkgs/pkgs/lib
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
..
2013-02-25 06:31:19 -05:00
2012-12-04 12:58:23 +01:00
2012-04-15 23:41:25 +00:00
2012-11-20 13:56:14 +01:00
2013-02-04 07:20:14 -05:00
2013-02-11 15:32:24 +01:00