6ab9d68e69
# Conflicts: # Code/Tools/ProjectManager/CMakeLists.txt # Code/Tools/ProjectManager/Source/GemCatalog.cpp # Code/Tools/ProjectManager/Source/GemCatalog.h # Code/Tools/ProjectManager/Source/GemCatalog.ui # Code/Tools/ProjectManager/Source/GemCatalog/GemCatalog.h # Code/Tools/ProjectManager/Source/ScreenFactory.cpp # Code/Tools/ProjectManager/project_manager_files.cmake # Code/Tools/ProjectManager/source/Qt/GemCatalog.h