diff options
| author | James Cook <james.cook@utoronto.ca> | 2015-02-10 09:24:38 -0800 |
|---|---|---|
| committer | James Cook <james.cook@utoronto.ca> | 2015-02-10 09:24:38 -0800 |
| commit | 3baf1c0772eb47cdec1211b1271464c719646d6a (patch) | |
| tree | ef8ab7707c4dc4b60cf7a056f83367bf809a1cce /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 5522aad3ecce201a42baf4169cfa62cf7f1879ba (diff) | |
| parent | 7a6af47cca7000d766873900efc211169d83b101 (diff) | |
Merge remote-tracking branch 'official/master' into ppp_2.4.7_squash
Conflicts:
pkgs/tools/networking/ppp/default.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions