| commit | ee5560a958a9568bdf053319af8c38c1e11f755e | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Thu Dec 20 23:04:40 2018 +0100 |
| committer | omar <omarcornut@gmail.com> | Thu Dec 20 23:04:40 2018 +0100 |
| tree | 46b9367ad40cc97112b25f1ca9840057428cf81f | |
| parent | 62cfdceac15b57f834d836ef944e66b70a4405e6 [diff] | |
| parent | d5b22fb6350e2078318f82fe3174c777e066cd64 [diff] |
Merge branch 'master' into viewport + added style tweak block when viewports are enabled # Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_win32_directx11/main.cpp