Gabriele Contini
2020-03-08 65454077a8c63b50adda4e8c6095c8f00675c4d2
refs
用户 Gabriele Contini <contini.mailing@gmail.com>
星期日, 三月 8, 2020 21:45 +0800
提交者 Gabriele Contini <contini.mailing@gmail.com>
星期日, 三月 8, 2020 21:45 +0800
提交65454077a8c63b50adda4e8c6095c8f00675c4d2
目录 4aeb5b931d73b73b37e9ebcdd23b392f45fef158 目录 | zip | gz
parent 9afdac17dcc8956fd795797bfc5b6e1c09285342 查看 | 对比
46f5b467557acc4b62f1d89943f39cd0ee6cb213 查看 | 对比
Merge branch 'feature/pc_identifiers' of
https://github.com/open-license-manager/open-license-manager.git into
feature/pc_identifiers

Conflicts:
src/library/hw_identifier/default_strategy.cpp
src/library/hw_identifier/identification_strategy.hpp
src/library/os/CMakeLists.txt
src/library/os/execution_environment.hpp
src/library/os/windows/cpu_info.cpp
src/library/os/windows/execution_environment.cpp
src/library/os/windows/isvm/BIOSReader.cpp
src/library/os/windows/isvm/BIOSReader.h
src/library/os/windows/os-win.c
3个文件已修改
1个文件已添加
104 ■■■■ 已修改文件
build/.gitkeep 对比 | 查看 | 原始文档 | blame | 历史
src/library/os/execution_environment.hpp 9 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/library/os/windows/cpu_info.cpp 34 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/library/os/windows/execution_environment.cpp 61 ●●●● 对比 | 查看 | 原始文档 | blame | 历史