Skip to content
Snippets Groups Projects
Commit 2a75001c authored by Ansgar Philippsen's avatar Ansgar Philippsen
Browse files

Merge branch 'new_gfx2' of git@github.com:codingfrenzy/openstructure into new_gfx2 

Conflicts:
	modules/gfx/src/impl/scene_fx.cc
	modules/gfx/src/scene.cc
	modules/gfx/src/shader.cc
parents 2efcaab5 06f80802
No related branches found
No related tags found
No related merge requests found
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