4 Commits (70703da7829ba74a92a08fe3c6fe0664c39c97c9)

Author SHA1 Message Date
ocornut dd4ca70b0d Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
4 years ago
omar 9c8671e7b0 Tables: Add empty file, skeleton. 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