Domen Kožar 4aa3eec330 Merge branch 'master' into staging ... Conflicts: pkgs/development/libraries/fontconfig/default.nix		2014-12-07 14:02:48 +01:00
..
darwin	fixes #1933	2014-10-23 00:14:09 +02:00
gnu
linux	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
windows