Skip to content
Commit 5545a9ce 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 ca86b961 b991a826
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