diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 18:05:43 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 18:07:11 +0100 |
| commit | 1575bc652eeee758816d63efccd1ab6eca16d2c9 (patch) | |
| tree | ab042157cc9f9304d9e05bb242681c7b7d0bb556 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 1c0477c08cfcb04d41bf7c0b828d642ce2956b4d (diff) | |
| parent | 7637e71cee2b11d340c5ce99d777f6783a6b9885 (diff) | |
Merge branch 'master' into staging
Conflicts (simple):
pkgs/os-specific/linux/util-linux/default.nix
It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions