# Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/shaders/gl_shader.cpp # src/gl/system/gl_framebuffer.cpp # src/gl_load/gl_interface.cpp |
||
|---|---|---|
| .. | ||
| gl_models.cpp | ||
| gl_models.h | ||
# Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/shaders/gl_shader.cpp # src/gl/system/gl_framebuffer.cpp # src/gl_load/gl_interface.cpp |
||
|---|---|---|
| .. | ||
| gl_models.cpp | ||
| gl_models.h | ||