Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

glow
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

69dc1e4c

Commit 69dc1e4c authored 5 years ago by Philip Trettner

Downloads
- Plain Diff

Merge branch 'develop' of https://www.graphics.rwth-aachen.de:9000/Glow/glow into develop

parents c0110908 bb5fb8db

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 3 additions, 2 deletions

CMakeLists.txt
src/glow/common/file_watch.cc 4 additions, 2 deletions

src/glow/common/file_watch.cc
src/glow/common/scoped_gl.hh 15 additions, 2 deletions

src/glow/common/scoped_gl.hh
src/glow/objects/NamedObject.cc 8 additions, 0 deletions

src/glow/objects/NamedObject.cc
src/glow/objects/VertexArray.cc 1 addition, 1 deletion

src/glow/objects/VertexArray.cc

with 31 additions and 7 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 sign in to comment