summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/GitPython/hardcode-git-path.patch
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-02-13 22:13:25 +0100
committerPeter Simons <simons@cryp.to>2015-02-13 22:13:25 +0100
commit54ce1a1810454aa24381d6c8370e48706ee48312 (patch)
tree79ba9fc6e4d95a84c9a4f9f888771d9c2f7a2314 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch
parentdb4cb021c024b65c08a3791edf2d4c613e8d44d8 (diff)
parentbc4ffd6ad6aa21857aadb730871610822a2d32bb (diff)
Merge remote-tracking branch 'origin/master' into staging.
Conflicts: pkgs/development/compilers/ghc/head.nix pkgs/top-level/haskell-ng.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions