4 Commits (7180e9ac661ea1c7b9dca6c89319049bb651c404)

Author SHA1 Message Date
ocornut 577e7cb493 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
4 years ago
ocornut dff0044d4e Backends, Examples: Added support for WebGPU and corresponding example. Amend 5853fbd (#3632) 4 years ago
ocornut c1ffac2fee Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
4 years ago
ocornut d20f2bc90a Rename example_emscripten/ to example_emscripten_opengl3/ (#3632) 4 years ago