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
..
default.nix	Blender: Tidy up, sort inputs, remove unused OPENJPEG option	2013-03-28 01:00:22 +01:00
fix-include.patch	blender: add the forgotten patch	2013-02-16 18:38:52 +01:00