summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineOpenGL
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-09-09 16:40:36 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-09-09 16:40:36 +0000
commit6f86cf0e9a3aa7f675fad67877398b7d261f778c (patch)
tree2824d76ddc677a1d8b023aff62c62b04936dcdce /Graphics/GraphicsEngineOpenGL
parentFew minor updated to ShaderResourcesD3D12 (diff)
downloadDiligentCore-6f86cf0e9a3aa7f675fad67877398b7d261f778c.tar.gz
DiligentCore-6f86cf0e9a3aa7f675fad67877398b7d261f778c.zip
Fixed merge conflicts
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
0 files changed, 0 insertions, 0 deletions