diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-21 12:57:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-21 12:57:30 +0200 |
| commit | 01f19f54e046417ca52ef67f5277ffe11de91371 (patch) | |
| tree | e0cb618ed08bea468a9c5b76ebd1552348bca2dc /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | e70593389fb3593408be57a4956190cfbe84f63e (diff) | |
| parent | 2d21e1e4ff42f4d6d93b166f495320f1a50fa181 (diff) | |
Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts:
pkgs/os-specific/linux/systemd/fixes.patch
pkgs/os-specific/linux/upower/0.99.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