diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-20 00:24:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-20 00:24:38 +0200 |
| commit | 3ec2cea214323f9b4a43c46b66dfa57ff465447c (patch) | |
| tree | 7e580446d07e86e8d7da03f3895f8dcf04045ef8 /pkgs/development/python-modules/GitPython | |
| parent | 219cae447dabe459da1510c5815c01afdc94aac4 (diff) | |
| parent | ca545ac8ecf4f4a7b93e70244f4b01779f117598 (diff) | |
Merge master into x-updates
Conflicts (auto-solved):
pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
0 files changed, 0 insertions, 0 deletions