Skip to content

Commit

Permalink
Merge branch 'master' into shaderc_cleanup
Browse files Browse the repository at this point in the history 
# Conflicts:
#	tools/shaderc/shaderc.cpp
#	tools/shaderc/shaderc_metal.cpp
  • Loading branch information
@phniix
phniix committed Feb 27, 2024
2 parents 231b36c + c00e439 commit e065ffd
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit e065ffd

Please sign in to comment.