diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 19:08:20 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 19:08:59 +0200 |
| commit | 4aec96b379d3f1b89128297b0943253d6961cf94 (patch) | |
| tree | bae26b8f66fa14c858f20ae409594e4abe7bc9b9 /pkgs/os-specific/linux/x86info | |
| parent | eb750f9a7b22620a9bafc1ff3c498e062b3bd5b2 (diff) | |
| parent | 6617c8bd87e185ece1762c22ed4521adebd7c65b (diff) | |
| download | nixlib-4aec96b379d3f1b89128297b0943253d6961cf94.tar nixlib-4aec96b379d3f1b89128297b0943253d6961cf94.tar.gz nixlib-4aec96b379d3f1b89128297b0943253d6961cf94.tar.bz2 nixlib-4aec96b379d3f1b89128297b0943253d6961cf94.tar.lz nixlib-4aec96b379d3f1b89128297b0943253d6961cf94.tar.xz nixlib-4aec96b379d3f1b89128297b0943253d6961cf94.tar.zst nixlib-4aec96b379d3f1b89128297b0943253d6961cf94.zip | |
Merge the two "same" merges
This only takes the state from the second parent. The purpose is that when this commit depends on the failed one, simply merging this commit is a safe way to fix the problems. Details: https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
Diffstat (limited to 'pkgs/os-specific/linux/x86info')
0 files changed, 0 insertions, 0 deletions