diff options
| author | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
| commit | 1c0d15b90ef67363f798d67d12dd31ed5fccb411 (patch) | |
| tree | 3693dd49b591dbbba261e95fc4b78650f1675578 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | bb61b45d92bad2435e80dcac855a78bda57ec7e8 (diff) | |
| parent | 2fc76ea05417671306d27f9ba83ef1b8d4049f3d (diff) | |
Merge branch 'origin/master' into staging.
Conflicts:
pkgs/development/libraries/ffmpeg/2.x.nix
pkgs/development/libraries/serf/default.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions