Skip to content
Commit 64aa32a4 authored by Michal Štrba's avatar Michal Štrba Committed by GitHub
Browse files

Merge pull request #6 from faiface/dev 

merge shader error fix
parents d595d5f6 01db742a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment