Merge branch 'kochi-substitute' of github.com:/auntieNeo/nixpkgs into kochi-substitute

Browse Source

Conflicts:
	pkgs/data/fonts/kochi-substitute/default.nix

...

This commit is contained in:

Jonathan Glines

2014-06-12 21:35:21 -06:00

parent 1a30cf5e09 18b9aff622

commit 9c5e28e6eb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available