| commit | e9053515bbcc33e9be5b4818b603cb89f39cedf3 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Aug 25 19:29:06 2020 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Tue Aug 25 19:29:06 2020 +0200 |
| tree | b1ec8fb4d36e406f8e1c648e1bda7eb8ce0c25a6 | |
| parent | 30f0900b1c5c840b817f73d0dadd1511e21f224c [diff] | |
| parent | 5919a6fa89e077e0b94f93036a2cef690790b06b [diff] |
Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp