diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-07 21:28:33 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-07 21:28:33 +0200 |
| commit | 916793cf130a8269bbda881e9081370d74595538 (patch) | |
| tree | 11c9e5d14f3178c6daf5a9c0a85f8a9e469ac356 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 026c31dd9d6570fc6d7475c0102745cbfb0d6972 (diff) | |
| parent | 86eaeb4c0a31e623c01f0d39fd5b3e64ce5f80b5 (diff) | |
Merge branch 'master' into systemd-219
Conflicts:
nixos/modules/system/boot/systemd.nix
pkgs/applications/networking/p2p/transmission/default.nix
pkgs/development/libraries/libseccomp/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions