Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates ... Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix		2013-06-08 15:41:39 +00:00
..
documentation	man-pages: Update to 3.50	2013-03-27 23:00:02 +01:00
fonts	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03:00
misc	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
sgml+xml