diff options
author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-16 22:45:54 +0100 |
---|---|---|
committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-16 22:59:59 +0100 |
commit | 99c79ea9fcabc82844f4f1833653cba2f6649ab5 (patch) | |
tree | 949f2b62dd30f2a262b25a03982f9cfddaaa5131 /.gitignore | |
parent | 7e8098139f1e8cb2346e9ad3c1787af193d8fea5 (diff) | |
parent | 6a52c4ee9d2ee8b5723fc9fac4ebc97b77357613 (diff) |
Imported recent improvements in Maneage, minor conflicts fixed
Some minor conflicts came up in 'download.mk' and 'verify.mk' (as expected
in the "IMPORTANT" commits) and were easily fixed by choosing this branch's
values.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions