diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-02-04 22:00:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-02-04 22:00:07 +0100 |
| commit | 4495d06a7fde26f15ed256f08a24115a013637ea (patch) | |
| tree | 15732b2661ddc8c258110a52f259fdf4c3537c0d /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 31810da31c98d6e634e2b5cb8eece3e3a67ce0cc (diff) | |
| parent | 643772777369229da75157e9192e3dd7bd2805fb (diff) | |
Merge branch 'master' into staging
Conflicts (simple):
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions