Skip to content
Commit 127efcd6 authored by Shea Levy's avatar Shea Levy
Browse files

Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 

Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
parents db4cb021 472feaf5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment