diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
| commit | ac6761c9081134baaa7dae18f06cbfaca38270d5 (patch) | |
| tree | a1ff0e93e8907624d65aff367496513d3dc47374 /pkgs/build-support/fetchhg | |
| parent | 177667eea987898097e854a54962ff90bbf4fa35 (diff) | |
| parent | 8088837dc8f35ef7853787f88bb1db7248900cc4 (diff) | |
Merge master into stdenv-updates
Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/build-support/fetchhg')
0 files changed, 0 insertions, 0 deletions