diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-11 19:37:22 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-11 19:37:22 -0500 |
| commit | 127efcd6f6bf5870b43efe588e37c28994ea94fa (patch) | |
| tree | bc9d5201e0809ea8ae47c38e7ce0d2fb15e7870e /pkgs/development/python-modules/GitPython | |
| parent | db4cb021c024b65c08a3791edf2d4c613e8d44d8 (diff) | |
| parent | 472feaf53becef9cc0551babc44a1f5db3beed51 (diff) | |
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
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions