nixpkgs/pkgs/development/libraries/fontconfig
Vladimír Čunát 625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
..
builder.sh
default.nix freetype: Update to 2.4.12 2013-06-21 18:44:33 +02:00
make-fonts-conf.nix
make-fonts-conf.xsl Process /etc/fonts/conf.d before upstream fonts/conf.d 2013-06-27 13:31:35 +02:00