diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
| commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
| tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/development/python-modules/GitPython | |
| parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
| parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions