diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-21 12:05:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-21 12:05:57 +0200 |
| commit | 9b02635faa726b3531675f34ce28787ad1378e73 (patch) | |
| tree | 5401098ac882f8f16b8e3b438747ba305f331b08 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 65ac375aa22f1bbcd01135193d8fc19a5d50bbbd (diff) | |
| parent | cd3ba19ec0d8752dd98c6f3f24aac80ea28426c0 (diff) | |
Merge recent master into x-updates
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions