gcontini
2020-03-08 75e4394d720c9cf8039a5e07110322c2b55bce8c
refs
用户 gcontini <1121667+gcontini@users.noreply.github.com>
星期日, 三月 8, 2020 21:45 +0800
提交者 gcontini <1121667+gcontini@users.noreply.github.com>
星期日, 三月 8, 2020 21:45 +0800
提交75e4394d720c9cf8039a5e07110322c2b55bce8c
目录 4aeb5b931d73b73b37e9ebcdd23b392f45fef158 目录 | zip | gz
parent d4edbb5a0aae0211389ce86264809b4237c73769 查看 | 对比
ed8d5e30f05ad96e66ffdb209c7868f8ac8da4c1 查看 | 对比
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 | 历史