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
..
documentation	man-pages: Update to 3.50	2013-03-27 23:00:02 +01:00
fonts
misc
sgml+xml