diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:42:33 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:43:59 +0200 |
commit | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (patch) | |
tree | 35dbf68b90a8b5e2cbbbbc3ccfbc2529d4c5ca23 /pkgs/tools/virtualization | |
parent | 34baf00b72ad0932f6a2add6cee88d2e8b7bec8e (diff) | |
parent | 249ba3d3ed76e34f61ab7bb2024b013f3feaafb9 (diff) | |
download | nixlib-5b0398dc36ce5746d8d54e04a1dfcab25939484a.tar nixlib-5b0398dc36ce5746d8d54e04a1dfcab25939484a.tar.gz nixlib-5b0398dc36ce5746d8d54e04a1dfcab25939484a.tar.bz2 nixlib-5b0398dc36ce5746d8d54e04a1dfcab25939484a.tar.lz nixlib-5b0398dc36ce5746d8d54e04a1dfcab25939484a.tar.xz nixlib-5b0398dc36ce5746d8d54e04a1dfcab25939484a.tar.zst nixlib-5b0398dc36ce5746d8d54e04a1dfcab25939484a.zip |
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190
Diffstat (limited to 'pkgs/tools/virtualization')
0 files changed, 0 insertions, 0 deletions