diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
| commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
| tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
| parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
Merge master into stdenv-updates
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions