ocornut
|
577e7cb493
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
|
2021-01-28 21:02:13 +01:00 |
|
ocornut
|
dff0044d4e
|
Backends, Examples: Added support for WebGPU and corresponding example. Amend 5853fbd (#3632)
|
2021-01-28 15:40:31 +01:00 |
|
ocornut
|
c1ffac2fee
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2020-12-03 20:05:49 +01:00 |
|
ocornut
|
d20f2bc90a
|
Rename example_emscripten/ to example_emscripten_opengl3/ (#3632)
|
2020-12-02 11:23:56 +01:00 |
|