| commit | 5116eee108986ba6f41eea6f8759eb6acc042670 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Mon May 04 15:05:07 2020 +0200 |
| committer | omar <omarcornut@gmail.com> | Mon May 04 15:05:07 2020 +0200 |
| tree | b773f290daf248cb0ed35440ddf0125a2d531717 | |
| parent | 7ddc1adefbdca94e7de350653def7a647ff45612 [diff] | |
| parent | b4dd28ffbbe4d382d38ef6de742db93388b5482f [diff] |
Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp