diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-07 00:09:37 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-07 00:09:37 +0200 |
| commit | a85dcf4a00c1ac354eda3b84209b8fa6b2133259 (patch) | |
| tree | 16bbf46e3cd5d7ea259783ee8b1ea8d5c7048e0d /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 4b2ce84872a0903b9800d3ed23915f48ecedc565 (diff) | |
| parent | 46a9e805efeee40d360605fa5987866ca45fed23 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions