diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-12-03 09:22:24 -0500 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-12-03 09:22:24 -0500 |
| commit | 929b7bdc4bf2328e2a4b789364af76b08f14e9dd (patch) | |
| tree | 7b925593c2506f29acf15db3e2bfa5051205fbb6 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 101f62ad33dc9eaab2d34880c5579c26912aab7e (diff) | |
| parent | bc3c49ce9bb98dae82f3999ea412f0e1794af9cc (diff) | |
Merge remote-tracking branch 'origin/master' into glibc-2.18
Conflicts:
pkgs/development/libraries/glibc/2.17/locales.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions