diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2014-12-05 07:54:48 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2014-12-05 07:54:48 +0100 |
| commit | 6fa969839a9727de9880f8c38a86f6a9bef8d278 (patch) | |
| tree | 9ae4fa57dc0ab96955b30ed4db98ed7513985b8e /pkgs/development/python-modules/GitPython | |
| parent | 21566e7c56370ffc7efdff0bc44453c2690caf15 (diff) | |
| parent | e51ece3a65390c4ef3e23f47a4bc4d1ba6dfec69 (diff) | |
Merge branch 'master' of https://github.com/NixOS/nixpkgs into update
Conflicts:
pkgs/development/libraries/haskell/text-binary/default.nix
pkgs/top-level/haskell-defaults.nix
pkgs/top-level/haskell-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions