Vladimír Čunát be70104a3a Merge master into x-updates ... Conflicts (taken master): pkgs/development/compilers/llvm/3.4/llvm.nix		2014-02-04 22:00:09 +01:00
..
builder.sh
default.nix	fontconfig: update 2.10.2 -> 2.11.0	2014-02-02 10:46:08 +01:00
make-fonts-conf.nix
make-fonts-conf.xsl	fontconfig: stop using xml:space; vital for nixos+2.11	2014-02-04 21:58:19 +01:00