diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:32:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:34:57 +0100 |
| commit | dbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch) | |
| tree | 18c61fd667b95bf3a3322e5f40161d2028b3e42c /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 5dab625862a5690a35c122f3749eee31879a2415 (diff) | |
| parent | b50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff) | |
Merge branch 'master' into staging
Conflicts (relatively simple):
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions