Skip to content
Snippets Groups Projects
Verified Commit 878e2560 authored by Silas Della Contrada's avatar Silas Della Contrada
Browse files

Merge branch 'feature/refactor-openglrenderer'

# Conflicts:
#	.gitignore
#	.idea/.gitignore
#	AVQt/CMakeLists.txt
#	AVQt/decoder/DecoderD3D11VA.cpp
#	AVQt/decoder/DecoderD3D11VA.h
#	AVQt/decoder/private/DecoderD3D11VA_p.h
#	Player/main.cpp
parents 25451da4 65e1f330
No related branches found
No related tags found
1 merge request!14Resolve "Heavy refactoring and cleanup is required for OpenGLRenderer"
Showing
with 304 additions and 186 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment