diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:08:43 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:08:43 +0200 |
| commit | 553abf71ba454a724d072a650a9cb09e360b375a (patch) | |
| tree | 7f483e613f6ef62f9e3dbf51ba930e80f7cf813d /pkgs/development/python-modules/GitPython | |
| parent | 592d4af9cf0e81907919cf954c1d0ad3089ae772 (diff) | |
| parent | 3aee39bb83337b586d0be702eb5dababc5f7ef29 (diff) | |
Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/libraries/wayland/default.nix
pkgs/development/tools/build-managers/cmake/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions